View | Details | Raw Unified | Return to issue 113784
Collapse All | Expand All

(-)chart2.31m11/chart2/source/model/main/ImplChartModel.cxx (-1 / +10 lines)
Lines 135-140 Link Here
135
135
136
    GetStyleFamilies();
136
    GetStyleFamilies();
137
    CreateDefaultChartTypeTemplate();
137
    CreateDefaultChartTypeTemplate();
138
    pNumFormatter = NULL;  // memory leak
138
}
139
}
139
140
140
ImplChartModel::ImplChartModel( const ImplChartModel & rOther, const Reference< util::XModifyListener > & xListener ) :
141
ImplChartModel::ImplChartModel( const ImplChartModel & rOther, const Reference< util::XModifyListener > & xListener ) :
Lines 160-165 Link Here
160
    m_xXMLNamespaceMap.set( CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap ));
161
    m_xXMLNamespaceMap.set( CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap ));
161
162
162
    CloneRefVector< Reference< chart2::XDiagram > >( rOther.m_aDiagrams, m_aDiagrams );
163
    CloneRefVector< Reference< chart2::XDiagram > >( rOther.m_aDiagrams, m_aDiagrams );
164
165
    pNumFormatter = NULL;  // memory leak
163
}
166
}
164
167
165
ImplChartModel::~ImplChartModel()
168
ImplChartModel::~ImplChartModel()
Lines 454-459 Link Here
454
    // note: m_xModifyListener is the ChartModel, so don't call dispose()
457
    // note: m_xModifyListener is the ChartModel, so don't call dispose()
455
    m_xModifyListener.clear();
458
    m_xModifyListener.clear();
456
459
460
    if ( pNumFormatter ) {      // memory leak
461
       delete pNumFormatter;
462
       pNumFormatter = NULL;
463
    }
464
457
    m_bIsDisposed = true;
465
    m_bIsDisposed = true;
458
}
466
}
459
467
Lines 577-583 Link Here
577
        if( !m_xOwnNumberFormatsSupplier.is() )
585
        if( !m_xOwnNumberFormatsSupplier.is() )
578
        {
586
        {
579
            Reference< lang::XMultiServiceFactory > xFactory( m_xContext->getServiceManager(), uno::UNO_QUERY );
587
            Reference< lang::XMultiServiceFactory > xFactory( m_xContext->getServiceManager(), uno::UNO_QUERY );
580
            m_xOwnNumberFormatsSupplier = new SvNumberFormatsSupplierObj( new SvNumberFormatter( xFactory, LANGUAGE_SYSTEM ) );
588
            pNumFormatter = new SvNumberFormatter( xFactory, LANGUAGE_SYSTEM ); // memory leak
589
            m_xOwnNumberFormatsSupplier = new SvNumberFormatsSupplierObj( pNumFormatter/*new SvNumberFormatter( xFactory, LANGUAGE_SYSTEM )*/ );
581
            //pOwnNumberFormatter->ChangeStandardPrec( 15 ); todo?
590
            //pOwnNumberFormatter->ChangeStandardPrec( 15 ); todo?
582
        }
591
        }
583
        m_xNumberFormatsSupplier = m_xOwnNumberFormatsSupplier;
592
        m_xNumberFormatsSupplier = m_xOwnNumberFormatsSupplier;
(-)chart2.31m11/chart2/source/model/main/ImplChartModel.hxx (+2 lines)
Lines 244-249 Link Here
244
    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>     m_xXMLNamespaceMap;
244
    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>     m_xXMLNamespaceMap;
245
245
246
    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >     m_xModifyListener;
246
    ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >     m_xModifyListener;
247
248
    SvNumberFormatter * pNumFormatter;  // memory leak
247
};
249
};
248
250
249
}  // namespace impl
251
}  // namespace impl

Return to issue 113784