openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1579184 [15/33] - in /openoffice/branches/alg_writerframes: ./ ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/ extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/kk/ extras/l10n/source/lt/ extras/l10n/source/nb/ ex...
Date Wed, 19 Mar 2014 10:15:07 GMT
Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx Wed Mar 19 10:14:42 2014
@@ -310,7 +310,7 @@ Any WrappedAxisTitleExistenceProperty::g
     sal_Bool bHasTitle = sal_False;
     
     Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) );
-    if( xTitle.is() && (TitleHelper::getCompleteString( xTitle ).getLength() != 0) )
+    if( xTitle.is() && (TitleHelper::getCompleteString( xTitle ).isEmpty() == false) )
         bHasTitle = sal_True;
     
     Any aRet;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx Wed Mar 19 10:14:42 2014
@@ -145,7 +145,7 @@ void lcl_ConvertRangeFromXML(
     ::rtl::OUString & rInOutRange,
     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
-    if( rInOutRange.getLength())
+    if( !rInOutRange.isEmpty() )
     {
         uno::Reference< chart2::data::XRangeXMLConversion > xConverter(
             lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY );
@@ -161,7 +161,7 @@ void lcl_ConvertRangeToXML(
     ::rtl::OUString & rInOutRange,
     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
-    if( rInOutRange.getLength())
+    if( !rInOutRange.isEmpty() )
     {
         uno::Reference< chart2::data::XRangeXMLConversion > xConverter(
             lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx Wed Mar 19 10:14:42 2014
@@ -172,7 +172,7 @@ WrappedVolumeProperty::~WrappedVolumePro
             if(    aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ) )
                 || aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ) ) )
                 m_aOuterValue <<= sal_Bool(sal_True);
-            else if( aTemplateAndService.second.getLength() || !m_aOuterValue.hasValue() )
+            else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() )
                 m_aOuterValue <<= sal_Bool(sal_False);
         }
         else if(!m_aOuterValue.hasValue())
@@ -245,7 +245,7 @@ WrappedUpDownProperty::~WrappedUpDownPro
             if(    aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ) )
                 || aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ) ) )
                 m_aOuterValue <<= sal_Bool(sal_True);
-            else if( aTemplateAndService.second.getLength() || !m_aOuterValue.hasValue() )
+            else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() )
                 m_aOuterValue <<= sal_Bool(sal_False);
         }
         else if(!m_aOuterValue.hasValue())

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx Wed Mar 19 10:14:42 2014
@@ -295,7 +295,7 @@ uno::Reference< XChartTypeTemplate > Cha
     uno::Reference< XChartTypeTemplate > xTemplate(0);
 
     rtl::OUString aServiceName( this->getServiceNameForParameter( rParameter ) );
-    if(aServiceName.getLength())
+    if( !aServiceName.isEmpty() )
     {
         xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY );
         if(xTemplate.is())

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowser.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowser.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowser.cxx Wed Mar 19 10:14:42 2014
@@ -1155,7 +1155,7 @@ bool DataBrowser::isDateString( rtl::OUS
 {
     sal_uInt32 nNumberFormat=0;
     SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
-    if( aInputString.getLength() > 0 &&  pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateValue ) )
+    if( !aInputString.isEmpty() &&  pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateValue ) )
     {
         Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( m_xChartDoc, uno::UNO_QUERY );
         Reference< util::XNumberFormats > xNumberFormats;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowserModel.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowserModel.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/DataBrowserModel.cxx Wed Mar 19 10:14:42 2014
@@ -100,7 +100,7 @@ OUString lcl_getUIRoleName(
     const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
 {
     OUString aResult( lcl_getRole( xLSeq ));
-    if( aResult.getLength())
+    if( !aResult.isEmpty() )
         aResult = ::chart::DialogModel::ConvertRoleFromInternalToUI( aResult );
     return aResult;
 }

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx Wed Mar 19 10:14:42 2014
@@ -90,9 +90,9 @@ OUString lcl_getFullSeriesName( const rt
 
 void lcl_addText( OUString& rOut, const OUString& rSeparator, const OUString& rNext )
 {
-    if( rOut.getLength() && rNext.getLength() )
+    if( !rOut.isEmpty() && !rNext.isEmpty() )
         rOut+=rSeparator;
-    if( rNext.getLength() )
+    if( !rNext.isEmpty() )
         rOut+=rNext;
 }
 
@@ -185,7 +185,7 @@ OUString lcl_getDataPointValueText( cons
         }
     }
 
-    if( aX.getLength() == 0 )
+    if( aX.isEmpty() )
     {
         aRet = ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex );
     }
@@ -394,7 +394,7 @@ OUString ObjectNameProvider::getTitleNam
             break;
     }
      
-    if( !aRet.getLength() )
+    if( aRet.isEmpty() )
         aRet=String(SchResId(STR_OBJECT_TITLE));
 
     return aRet;
@@ -413,7 +413,7 @@ OUString ObjectNameProvider::getTitleNam
         if( TitleHelper::getTitleType( eType, xTitle, xChartModel ) )
             aRet = ObjectNameProvider::getTitleNameByType( eType );
     }
-    if( !aRet.getLength() )
+    if( aRet.isEmpty() )
         aRet=String(SchResId(STR_OBJECT_TITLE));
 
     return aRet;
@@ -737,7 +737,7 @@ rtl::OUString ObjectNameProvider::getSel
         // use the verbose text including the formula for trend lines
         const bool bVerbose( OBJECTTYPE_DATA_CURVE == eObjectType || OBJECTTYPE_DATA_AVERAGE_LINE == eObjectType );
         const OUString aHelpText( getHelpText( rObjectCID, xChartModel, bVerbose ));
-        if( aHelpText.getLength())
+        if( !aHelpText.isEmpty() )
         {
             aRet = String( SchResId( STR_STATUS_OBJECT_MARKED ));
             replaceParamterInString( aRet, C2U("%OBJECTNAME"), aHelpText );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/res_ErrorBar.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/res_ErrorBar.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/res_ErrorBar.cxx Wed Mar 19 10:14:42 2014
@@ -760,7 +760,7 @@ void ErrorBarResources::disposingRangeSe
 bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit )
 {
     ::rtl::OUString aRange( rEdit.GetText());
-    bool bIsValid = ( aRange.getLength() == 0 ) ||
+    bool bIsValid = aRange.isEmpty() ||
         ( m_apRangeSelectionHelper.get() &&
           m_apRangeSelectionHelper->verifyCellRange( aRange ));
 

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src Wed Mar 19 10:14:42 2014
@@ -143,8 +143,7 @@ TabPage TP_3D_SCENEGEOMETRY
         First = 0 ;
         Last = 100 ;
         SpinSize = 5 ;
-        Unit = FUNIT_CUSTOM ;
-		CustomUnitText = "%" ;
+        Unit = FUNIT_PERCENT ;
 	};
 };
 

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_DataSource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_DataSource.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_DataSource.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_DataSource.cxx Wed Mar 19 10:14:42 2014
@@ -69,7 +69,10 @@ const OUString lcl_aLabelRole( RTL_CONST
 String lcl_GetRoleLBEntry(
     const OUString & rRole, const OUString & rRange )
 {
-    String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
+    String aEntry( rRole );
+    aEntry += '\t';
+    aEntry += String(
+        ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
     aEntry += '\t';
     aEntry += String( rRange );
 
@@ -137,8 +140,8 @@ OUString lcl_GetSequenceNameForLabel( ::
 }
 
 static long lcl_pRoleListBoxTabs[] =
-	{	2,        // Number of Tabs
-		0, 75
+    {   3,        // Number of Tabs
+        0, 0, 75
 	};
 
 void lcl_ShowChooserButton(
@@ -395,7 +398,7 @@ sal_Bool DataSourceTabPage::commitPage( 
 bool DataSourceTabPage::isRangeFieldContentValid( Edit & rEdit )
 {
     OUString aRange( rEdit.GetText());
-    bool bIsValid = ( aRange.getLength() == 0 ) ||
+    bool bIsValid = aRange.isEmpty() ||
         m_rDialogModel.getRangeSelectionHelper()->verifyCellRange( aRange );
 
     if( bIsValid )
@@ -900,7 +903,7 @@ bool DataSourceTabPage::updateModelFromC
         if( xDataProvider.is())
         {
             OUString aRange( m_aEDT_CATEGORIES.GetText());
-            if( aRange.getLength())
+            if( !aRange.isEmpty() )
             {
                 // create or change categories
                 if( !xLabeledSeq.is())
@@ -966,7 +969,7 @@ bool DataSourceTabPage::updateModelFromC
                         }
                         if( xLabeledSeq.is())
                         {
-                            if( aRange.getLength())
+                            if( !aRange.isEmpty() )
                             {
                                 Reference< data::XDataSequence > xNewSeq;
                                 try
@@ -997,7 +1000,7 @@ bool DataSourceTabPage::updateModelFromC
                     }
                     else
                     {
-                        if( aRange.getLength())
+                        if( !aRange.isEmpty() )
                         {
                             Reference< data::XDataSequence > xNewSeq;
                             try

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx Wed Mar 19 10:14:42 2014
@@ -284,7 +284,7 @@ bool RangeChooserTabPage::isValid()
         || ( m_aCB_FirstRowAsLabel.IsChecked()    && !m_aRB_Rows.IsChecked() );
     sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() )
         || ( m_aCB_FirstRowAsLabel.IsChecked()    && m_aRB_Rows.IsChecked() );
-    bool bIsValid = ( aRange.getLength() == 0 ) ||
+    bool bIsValid = aRange.isEmpty() ||
         m_rDialogModel.getRangeSelectionHelper()->verifyArguments(
             DataSourceHelper::createArguments(
                 aRange, Sequence< sal_Int32 >(), m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories ));

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src Wed Mar 19 10:14:42 2014
@@ -77,8 +77,7 @@ TabPage TP_OPTIONS
 		Minimum = -100 ;
 		Maximum = 100 ;
 		StrictFormat = TRUE ;
-		Unit = FUNIT_CUSTOM ;
-		CustomUnitText  = " %" ;
+		Unit = FUNIT_PERCENT ;
 		First = 1 ;
 		Last = 100 ;
 		SpinSize = 1 ;
@@ -104,8 +103,7 @@ TabPage TP_OPTIONS
 		Minimum = 0 ;
 		Maximum = 600 ;
 		StrictFormat = TRUE ;
-		Unit = FUNIT_CUSTOM ;
-		CustomUnitText  = " %" ;
+		Unit = FUNIT_PERCENT ;
 		First = 1 ;
 		Last = 100 ;
 		SpinSize = 1 ;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx Wed Mar 19 10:14:42 2014
@@ -353,7 +353,7 @@ SfxItemSet DrawViewWrapper::getPositionA
 
 SdrObject* DrawViewWrapper::getNamedSdrObject( const rtl::OUString& rName ) const
 {
-    if(rName.getLength()==0)
+    if( rName.isEmpty() )
         return 0;
     SdrPageView* pSdrPageView = this->GetPageView();
     if( pSdrPageView )

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx Wed Mar 19 10:14:42 2014
@@ -298,7 +298,7 @@ bool ErrorBarItemConverter::ApplySpecial
                 bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS );
                 if( xChartDoc->hasInternalDataProvider())
                 {
-                    if( aNewRange.getLength())
+                    if( !aNewRange.isEmpty() )
                     {
                         uno::Reference< chart2::data::XDataSequence > xSeq(
                             StatisticsHelper::getErrorDataSequenceFromDataSource(

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx Wed Mar 19 10:14:42 2014
@@ -304,7 +304,7 @@ void GraphicPropertyItemConverter::FillS
                         // this is important to enable the item
                         ::rtl::OUString aName;
                         if( (aValue >>= aName) &&
-                            aName.getLength())
+                            !aName.isEmpty())
                         {
                             aItem.SetEnabled( sal_True );
                             rOutItemSet.Put( aItem );
@@ -547,7 +547,7 @@ bool GraphicPropertyItemConverter::Apply
                     {
                         ::rtl::OUString aName;
                         if( ( GetPropertySet()->getPropertyValue( aPropName ) >>= aName )
-                            && aName.getLength() > 0 )
+                            && !aName.isEmpty() )
                         {
                             uno::Reference< beans::XPropertyState > xState( GetPropertySet(), uno::UNO_QUERY );
                             if( xState.is())

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx Wed Mar 19 10:14:42 2014
@@ -477,7 +477,7 @@ bool StatisticsItemConverter::ApplySpeci
                 bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS );
                 if( xChartDoc->hasInternalDataProvider())
                 {
-                    if( aNewRange.getLength())
+                    if( !aNewRange.isEmpty() )
                     {
                         uno::Reference< chart2::data::XDataSequence > xSeq(
                             StatisticsHelper::getErrorDataSequenceFromDataSource(

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController.cxx Wed Mar 19 10:14:42 2014
@@ -1066,7 +1066,7 @@ bool lcl_isFormatObjectCommand( const rt
 {
 	if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() )
 	{
-        if( rTargetFrameName.getLength() &&
+        if( !rTargetFrameName.isEmpty() &&
             rTargetFrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self")))
             return m_aDispatchContainer.getDispatchForURL( rURL );
 	}
@@ -1453,7 +1453,7 @@ IMPL_LINK( ChartController, NotifyUndoAc
     ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L );
 
     ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
-    if ( aObjectCID.getLength() == 0 )
+    if ( aObjectCID.isEmpty() )
     {
         try
         {

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Position.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Position.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Position.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Position.cxx Wed Mar 19 10:14:42 2014
@@ -124,7 +124,7 @@ void SAL_CALL ChartController::executeDi
 {
     const ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
 
-    if( !aCID.getLength() )
+    if( aCID.isEmpty() )
         return;
 
     awt::Size aSelectedSize;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Properties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Properties.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Properties.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Properties.cxx Wed Mar 19 10:14:42 2014
@@ -727,7 +727,7 @@ bool ChartController::executeDlg_ObjectP
 {
     //return true if the properties were changed successfully
     bool bRet = false;
-    if( !rObjectCID.getLength() )
+    if( rObjectCID.isEmpty() )
     {
         //DBG_ERROR("empty ObjectID");
         return bRet;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_TextEdit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_TextEdit.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_TextEdit.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_TextEdit.cxx Wed Mar 19 10:14:42 2014
@@ -155,7 +155,7 @@ bool ChartController::EndTextEdit()
 							pOutliner->GetParagraphCount() );
 
         ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
-        if ( aObjectCID.getLength() > 0 )
+        if ( !aObjectCID.isEmpty() )
         {
             uno::Reference< beans::XPropertySet > xPropSet =
                 ObjectIdentifier::getObjectPropertySet( aObjectCID, getModel() );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Tools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Tools.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Tools.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Tools.cxx Wed Mar 19 10:14:42 2014
@@ -637,7 +637,7 @@ bool ChartController::executeDispatch_De
     // remove the selected object
     //
     rtl::OUString aCID( m_aSelection.getSelectedCID() );
-    if( aCID.getLength() )
+    if( !aCID.isEmpty() )
     {
         if( !isObjectDeleteable( uno::Any( aCID ) ) )
             return false;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Window.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Window.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Window.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartController_Window.cxx Wed Mar 19 10:14:42 2014
@@ -942,7 +942,7 @@ void ChartController::execute_DoubleClic
     if ( m_aSelection.hasSelection() )
     {
         ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
-        if ( aCID.getLength() )
+        if ( !aCID.isEmpty() )
         {
             ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
             if ( OBJECTTYPE_TITLE == eObjectType )
@@ -1232,7 +1232,7 @@ void ChartController::execute_Command( c
                         bool bHasTitle = false;
                         uno::Reference< XTitled > xTitled( xAxis, uno::UNO_QUERY );
                         if( xTitled.is())
-                            bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0;
+                            bHasTitle = ( TitleHelper::getCompleteString( xTitled->getTitleObject() ).isEmpty() == false );
                         
                         if( OBJECTTYPE_AXIS  != eObjectType && bIsAxisVisible )
                             lcl_insertMenuCommand( xPopupMenu, nUniqueId++, C2U(".uno:FormatAxis") );
@@ -1508,7 +1508,7 @@ bool ChartController::execute_KeyInput( 
                             fShiftAmountX = 0.0;
                             break;
                     }
-                    if( m_aSelection.getSelectedCID().getLength() )
+                    if( !m_aSelection.getSelectedCID().isEmpty() )
                     {
                         //move chart objects
                         bReturn = impl_moveOrResizeObject(
@@ -1622,7 +1622,7 @@ bool ChartController::requestQuickHelp(
         aCID = SelectionHelper::getHitObjectCID(
             aAtLogicPosition, *m_pDrawViewWrapper );
     }
-    bool bResult( aCID.getLength());
+    bool bResult( !aCID.isEmpty() );
 
     if( bResult )
     {
@@ -1702,7 +1702,7 @@ bool ChartController::requestQuickHelp(
     if ( m_aSelection.hasSelection() )
     {
         ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
-        if ( aCID.getLength() )
+        if ( !aCID.isEmpty() )
         {
             aReturn = uno::makeAny( aCID );
         }
@@ -2027,7 +2027,7 @@ void ChartController::impl_SetMousePoint
                 }
             }
 
-            if( !aHitObjectCID.getLength() )
+            if( aHitObjectCID.isEmpty() )
             {
                 //additional shape was hit
                 m_pChartWindow->SetPointer( POINTER_MOVE );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartTransferable.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartTransferable.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ChartTransferable.cxx Wed Mar 19 10:14:42 2014
@@ -79,6 +79,7 @@ void ChartTransferable::AddSupportedForm
         AddFormat( SOT_FORMATSTR_ID_DRAWING );
     }
     AddFormat( SOT_FORMAT_GDIMETAFILE );
+    AddFormat( SOT_FORMATSTR_ID_PNG );
     AddFormat( SOT_FORMAT_BITMAP );
 }
 

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ControllerCommandDispatch.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ControllerCommandDispatch.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ControllerCommandDispatch.cxx Wed Mar 19 10:14:42 2014
@@ -705,14 +705,14 @@ void ControllerCommandDispatch::fireStat
     const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ )
 {
     bool bIsChartSelectorURL = rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ChartElementSelector") );
-    if( rURL.getLength() == 0 || bIsChartSelectorURL )
+    if( rURL.isEmpty() || bIsChartSelectorURL )
     {
         uno::Any aArg;
         aArg <<= m_xController;
         fireStatusEventForURL( C2U(".uno:ChartElementSelector"), aArg, true, xSingleListener );
     }
 
-    if( rURL.getLength() == 0 )
+    if( rURL.isEmpty() )
         for( ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.begin());
              aIt != m_aCommandAvailability.end(); ++aIt )
             fireStatusEventForURLImpl( aIt->first, xSingleListener );
@@ -721,7 +721,7 @@ void ControllerCommandDispatch::fireStat
 
     // statusbar. Should be handled by base implementation
     // @todo: remove if Issue 68864 is fixed
-    if( rURL.getLength() == 0 ||
+    if( rURL.isEmpty() ||
         rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:StatusBarVisible")))
     {
         bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController ));

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/DrawCommandDispatch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/DrawCommandDispatch.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/DrawCommandDispatch.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/DrawCommandDispatch.cxx Wed Mar 19 10:14:42 2014
@@ -592,7 +592,7 @@ bool DrawCommandDispatch::parseCommandUR
 
     sal_Int32 nIndex = 1;
     ::rtl::OUString aToken = rCommandURL.getToken( 0, '.', nIndex );
-    if ( nIndex == -1 || !aToken.getLength() )
+    if ( nIndex == -1 || aToken.isEmpty() )
     {
         aBaseCommand = rCommandURL;
         SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( aBaseCommand );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ElementSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ElementSelector.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ElementSelector.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ElementSelector.cxx Wed Mar 19 10:14:42 2014
@@ -152,7 +152,7 @@ void SelectorListBox::UpdateChartElement
                 ListBoxEntryData aEntry;
                 SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() );
                 ::rtl::OUString aName( pSelectedObj ? pSelectedObj->GetName() : String() );
-                aEntry.UIName = ( aName.getLength() > 0 ? aName : ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) );
+                aEntry.UIName = ( !aName.isEmpty() ? aName : ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) );
                 aEntry.OID = aSelectedOID;
                 m_aEntries.push_back( aEntry );
             }

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx Wed Mar 19 10:14:42 2014
@@ -63,7 +63,7 @@ bool FeatureCommandDispatchBase::isFeatu
 void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL,
     const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ )
 {
-    if ( rURL.getLength() == 0 )
+    if ( rURL.isEmpty() )
     {
         SupportedFeatures::const_iterator aEnd( m_aSupportedFeatures.end() );
         for ( SupportedFeatures::const_iterator aIter( m_aSupportedFeatures.begin() ); aIter != aEnd; ++aIter )

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ObjectHierarchy.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ObjectHierarchy.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ObjectHierarchy.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/ObjectHierarchy.cxx Wed Mar 19 10:14:42 2014
@@ -93,7 +93,7 @@ void lcl_getChildOIDs(
                 if( xInfo.is() &&
                     xInfo->hasPropertyByName( C2U("Name")) &&
                     (xShapeProp->getPropertyValue( C2U("Name")) >>= aName ) &&
-                    aName.getLength() > 0 &&
+                    !aName.isEmpty() &&
                     ::chart::ObjectIdentifier::isCID( aName ))
                 {
                     rOutChildren.push_back( ::chart::ObjectIdentifier( aName ) );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/SelectionHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/SelectionHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/SelectionHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/SelectionHelper.cxx Wed Mar 19 10:14:42 2014
@@ -372,7 +372,7 @@ bool SelectionHelper::findNamedParent( S
 
     if(!pObj)
         return false;
-    if(!aName.getLength())
+    if( aName.isEmpty() )
         return false;
 
     pInOutObject = pObj;
@@ -397,7 +397,7 @@ bool SelectionHelper::isDragableObjectHi
                     , const rtl::OUString& rNameOfSelectedObject
                     , const DrawViewWrapper& rDrawViewWrapper )
 {
-    if(!rNameOfSelectedObject.getLength())
+    if( rNameOfSelectedObject.isEmpty() )
         return false;
     if( !ObjectIdentifier::isDragableObject(rNameOfSelectedObject) )
         return false;
@@ -436,13 +436,13 @@ bool SelectionHelper::isDragableObjectHi
 
     rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
     //get page when nothing was hit
-    if( aRet.getLength() == 0  && !pNewObj )
+    if( aRet.isEmpty()  && !pNewObj )
     {
         aRet = aPageCID;
     }
 
     //get diagram instead wall or page if hit inside diagram
-    if( aRet.getLength() != 0  )
+    if( !aRet.isEmpty()  )
     {
         if( aRet.equals( aPageCID ) )
         {
@@ -511,7 +511,7 @@ SdrObject* SelectionHelper::getMarkHandl
     rtl::OUString aName( lcl_getObjectName( pObj ) );
     if( aName.match(C2U("MarkHandles")) || aName.match(C2U("HandlesOnly")) )
         return pObj;
-    if( aName.getLength() )//dont't get the markhandles of a different object
+    if( !aName.isEmpty() )//dont't get the markhandles of a different object
         return 0;
 
     //search for a child with name "MarkHandles" or "HandlesOnly"

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx Wed Mar 19 10:14:42 2014
@@ -80,7 +80,7 @@ void StatusBarCommandDispatch::fireStatu
     const OUString & rURL,
     const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ )
 {
-    bool bFireAll(rURL.getLength() == 0);
+    bool bFireAll( rURL.isEmpty() );
     bool bFireContext(  bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Context")));
     bool bFireModified( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ModifiedStatus")));
 

Modified: openoffice/branches/alg_writerframes/main/chart2/source/controller/main/UndoCommandDispatch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/controller/main/UndoCommandDispatch.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/controller/main/UndoCommandDispatch.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/controller/main/UndoCommandDispatch.cxx Wed Mar 19 10:14:42 2014
@@ -74,7 +74,7 @@ void UndoCommandDispatch::fireStatusEven
 {
     if( m_xUndoManager.is() )
     {
-        bool bFireAll = (rURL.getLength() == 0);
+        const bool bFireAll = rURL.isEmpty();
         uno::Any aUndoState, aRedoState;
         if( m_xUndoManager->isUndoPossible())
         {

Modified: openoffice/branches/alg_writerframes/main/chart2/source/model/filter/XMLFilter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/model/filter/XMLFilter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/model/filter/XMLFilter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/model/filter/XMLFilter.cxx Wed Mar 19 10:14:42 2014
@@ -158,7 +158,7 @@ uno::Reference< embed::XStorage > lcl_ge
         OUString aMediaType;
         if ( ! xProp.is() ||
              ! ( xProp->getPropertyValue( C2U("MediaType")) >>= aMediaType ) ||
-             ( aMediaType.getLength() == 0 ))
+             aMediaType.isEmpty() )
         {
             xProp->setPropertyValue( C2U("MediaType"), uno::makeAny( _sMediaType ));
         }
@@ -433,10 +433,10 @@ sal_Int32 XMLFilter::impl_Import(
             }
 	    }
 
-        if( aBaseUri.getLength() )
+        if( !aBaseUri.isEmpty() )
             xImportInfo->setPropertyValue( C2U("BaseURI"), uno::makeAny( aBaseUri ) );
 
-	    if( aHierarchName.getLength() )
+	    if( !aHierarchName.isEmpty() )
 		    xImportInfo->setPropertyValue( C2U("StreamRelPath"), uno::makeAny( aHierarchName ) );
 
         // import meta information
@@ -544,7 +544,7 @@ sal_Int32 XMLFilter::impl_ImportStream(
                 Reference< document::XImporter > xImporter( xDocHandler, uno::UNO_QUERY_THROW );
                 xImporter->setTargetDocument( Reference< lang::XComponent >( m_xTargetDoc, uno::UNO_QUERY_THROW ));
 
-                if ( m_sDocumentHandler.getLength() )
+                if ( !m_sDocumentHandler.isEmpty() )
                 {
                     try
                     {
@@ -642,7 +642,7 @@ sal_Int32 XMLFilter::impl_Export(
 
         uno::Reference< xml::sax::XDocumentHandler> xDocHandler( xSaxWriter, uno::UNO_QUERY );
 
-        if ( m_sDocumentHandler.getLength() )
+        if ( !m_sDocumentHandler.isEmpty() )
         {
             try
             {

Modified: openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel.cxx Wed Mar 19 10:14:42 2014
@@ -344,7 +344,7 @@ sal_Bool SAL_CALL ChartModel::attachReso
 		return sal_False; //behave passive if already disposed or closed or throw exception @todo?
 	//mutex is acquired
 
-	if(m_aResource.getLength()!=0)//we have a resource already //@todo? or is setting a new resource allowed?
+	if(!m_aResource.isEmpty())//we have a resource already //@todo? or is setting a new resource allowed?
 		return sal_False;
 	m_aResource = rURL;
 	m_aMediaDescriptor = rMediaDescriptor;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel_Persistence.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel_Persistence.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel_Persistence.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/model/main/ChartModel_Persistence.cxx Wed Mar 19 10:14:42 2014
@@ -160,7 +160,7 @@ Reference< document::XFilter > ChartMode
         lcl_getProperty< OUString >( rMediaDescriptor, OUString::createFromAscii("FilterName")));
 
     // if FilterName was found, get Filter from factory
-    if( aFilterName.getLength() > 0 )
+    if( !aFilterName.isEmpty() )
     {
         try
         {
@@ -177,7 +177,7 @@ Reference< document::XFilter > ChartMode
                 OUString aFilterServiceName(
                     lcl_getProperty< OUString >( aProps, OUString::createFromAscii("FilterService")));
 
-                if( aFilterServiceName.getLength())
+                if( !aFilterServiceName.isEmpty() )
                 {
                     xFilter.set(
                         m_xContext->getServiceManager()->createInstanceWithContext(
@@ -229,7 +229,7 @@ sal_Bool SAL_CALL ChartModel::hasLocatio
     throw(uno::RuntimeException)
 {
 	//@todo guard
-	return m_aResource.getLength()!=0;
+	return !m_aResource.isEmpty();
 }
 
 ::rtl::OUString SAL_CALL ChartModel::getLocation()
@@ -255,7 +255,7 @@ void SAL_CALL ChartModel::store()
 
 	::rtl::OUString aLocation = m_aResource;
 
-	if( aLocation.getLength() == 0 )
+	if( aLocation.isEmpty() )
 		throw io::IOException( C2U( "no location specified" ), static_cast< ::cppu::OWeakObject* >(this));
 	//@todo check wether aLocation is something like private:factory...
 	if( m_bReadOnly )

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSeriesHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSeriesHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSeriesHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSeriesHelper.cxx Wed Mar 19 10:14:42 2014
@@ -330,7 +330,7 @@ OUString getLabelForLabeledDataSequence(
         Reference< chart2::data::XDataSequence > xSeq( xLabeledSeq->getLabel());
         if( xSeq.is() )
             aResult = lcl_getDataSequenceLabel( xSeq );
-        if( !xSeq.is() || !aResult.getLength() )
+        if( !xSeq.is() || aResult.isEmpty() )
         {
             // no label set or label content is empty -> use auto-generated one
             Reference< chart2::data::XDataSequence > xValueSeq( xLabeledSeq->getValues() );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSourceHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSourceHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSourceHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/DataSourceHelper.cxx Wed Mar 19 10:14:42 2014
@@ -348,7 +348,7 @@ bool DataSourceHelper::detectRangeSegmen
         DataSourceHelper::readArguments(
             xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument ) ),
             rOutRangeString, rSequenceMapping, rOutUseColumns, rOutFirstCellAsLabel, rOutHasCategories );
-        bSomethingDetected = (rOutRangeString.getLength() > 0);
+        bSomethingDetected = !rOutRangeString.isEmpty();
 
         uno::Reference< chart2::data::XLabeledDataSequence > xCategories(
                     DiagramHelper::getCategoriesFromDiagram( xChartDocument->getFirstDiagram() ));
@@ -403,7 +403,7 @@ bool DataSourceHelper::allArgumentsForRe
             {
                 ::rtl::OUString aRange;
                 bHasCellRangeRepresentation =
-                    (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && aRange.getLength() > 0);
+                    (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && !aRange.isEmpty());
             }
 //         else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
 //         {

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/DiagramHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/DiagramHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/DiagramHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/DiagramHelper.cxx Wed Mar 19 10:14:42 2014
@@ -92,7 +92,7 @@ DiagramHelper::tTemplateWithServiceName
     Sequence< OUString > aServiceNames( xChartTypeManager->getAvailableServiceNames());
     const sal_Int32 nLength = aServiceNames.getLength();
 
-    bool bHasPreferredTemplate = (rPreferredTemplateName.getLength() > 0);
+    bool bHasPreferredTemplate = !rPreferredTemplateName.isEmpty();
     bool bTemplateFound = false;
 
     if( bHasPreferredTemplate )

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/ExplicitCategoriesProvider.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/ExplicitCategoriesProvider.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/ExplicitCategoriesProvider.cxx Wed Mar 19 10:14:42 2014
@@ -84,7 +84,7 @@ ExplicitCategoriesProvider::ExplicitCate
                 uno::Reference< data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() );
                 
                 OUString aCatgoriesRange( DataSourceHelper::getRangeFromValues( m_xOriginalCategories ) );
-                if( xDataProvider.is() && aCatgoriesRange.getLength() )
+                if( xDataProvider.is() && !aCatgoriesRange.isEmpty() )
                 {
                     const bool bFirstCellAsLabel = false;
                     const bool bHasCategories = false;
@@ -299,7 +299,7 @@ std::vector< ComplexCategory > lcl_DataS
         }
         else
         {
-            if( aCurrent.getLength() && aPrevious != aCurrent )
+            if( !aCurrent.isEmpty() && aPrevious != aCurrent )
             {
                 aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) );
                 nCurrentCount=1;
@@ -399,9 +399,9 @@ Sequence< OUString > lcl_getExplicitSimp
                 if(!aOuterIt->empty()) // #121277# Caution, aOuterIt may be empty (!)
                 {
                     aAddText = (*aOuterIt)[nN].Text;
-                    if( aAddText.getLength() )
+                    if( !aAddText.isEmpty() )
                     {
-                        if(aText.getLength())
+                        if( !aText.isEmpty() )
                             aText += aSpace;
                         aText += aAddText;
                     }
@@ -483,7 +483,7 @@ bool lcl_fillDateCategories( const uno::
             {
                 OUString aTest;
                 double fTest = 0;
-                if( (aAny>>=aTest) && !aTest.getLength() ) //empty String
+                if( (aAny>>=aTest) && aTest.isEmpty() ) //empty String
                     bContainsEmptyString = true;
                 else if( (aAny>>=fTest) &&  ::rtl::math::isNan(fTest) )
                     bContainsNan = true;

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/InternalDataProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/InternalDataProvider.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/InternalDataProvider.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/InternalDataProvider.cxx Wed Mar 19 10:14:42 2014
@@ -712,7 +712,7 @@ Reference< chart2::data::XDataSequence >
                             : m_aInternalData.getRowCount()) - 1;
         return lcl_createDataSequenceAndAddToMap( OUString::valueOf( nIndex ));
     }
-    else if( aRangeRepresentation.getLength())
+    else if( !aRangeRepresentation.isEmpty() )
     {
         // data
         sal_Int32 nIndex = aRangeRepresentation.toInt32();

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/NamedProperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/NamedProperties.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/NamedProperties.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/NamedProperties.cxx Wed Mar 19 10:14:42 2014
@@ -46,7 +46,7 @@ void NamedProperties::AddPropertiesToVec
 OUString NamedProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
 {
     OUString aName = NamedFillProperties::GetPropertyNameForHandle( nHandle );
-    if( !aName.getLength() )
+    if( aName.isEmpty() )
         aName = NamedLineProperties::GetPropertyNameForHandle( nHandle );
     return aName;
 }

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/ObjectIdentifier.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/ObjectIdentifier.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/ObjectIdentifier.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/ObjectIdentifier.cxx Wed Mar 19 10:14:42 2014
@@ -86,14 +86,14 @@ OUString lcl_createClassificationStringF
         default:
             ;//empty string
     }
-    if( rDragMethodServiceName.getLength() )
+    if( !rDragMethodServiceName.isEmpty() )
     {
         if( aRet.getLength() )
             aRet.appendAscii(":");
         aRet.append( m_aDragMethodEquals );
         aRet.append( rDragMethodServiceName );  
 
-        if( rDragParameterString.getLength() )
+        if( !rDragParameterString.isEmpty() )
         {
             if( aRet.getLength() )
                 aRet.appendAscii(":");
@@ -186,7 +186,7 @@ OUString lcl_getIndexStringAfterString( 
 sal_Int32 lcl_StringToIndex( const OUString& rIndexString )
 {
     sal_Int32 nRet = -1;
-    if( rIndexString.getLength() )
+    if( !rIndexString.isEmpty() )
     {
         nRet = rIndexString.toInt32();
         if( nRet < -1 )
@@ -317,15 +317,15 @@ bool ObjectIdentifier::operator!=( const
 bool ObjectIdentifier::operator<( const ObjectIdentifier& rOID ) const
 {
     bool bReturn = false;
-    if ( m_aObjectCID.getLength() && rOID.m_aObjectCID.getLength() )
+    if ( !m_aObjectCID.isEmpty() && !rOID.m_aObjectCID.isEmpty() )
     {
         bReturn = ( m_aObjectCID.compareTo( rOID.m_aObjectCID ) < 0 );
     }
-    else if ( m_aObjectCID.getLength() )
+    else if ( !m_aObjectCID.isEmpty() )
     {
         bReturn = true;
     }
-    else if ( rOID.m_aObjectCID.getLength() )
+    else if ( !rOID.m_aObjectCID.isEmpty() )
     {
         bReturn = false;
     }
@@ -440,10 +440,10 @@ OUString ObjectIdentifier::createClassif
     if(aRet.getLength()>m_aProtocol.getLength())
         aRet.appendAscii("/");
 
-    if(rParentParticle.getLength())
+    if( !rParentParticle.isEmpty() )
     {
         aRet.append(rParentParticle);
-        if( rChildParticle.getLength() )
+        if( !rChildParticle.isEmpty() )
             aRet.appendAscii(":");
     }
     aRet.append(rChildParticle);
@@ -593,7 +593,7 @@ OUString ObjectIdentifier::createClassif
     if(aRet.getLength()>m_aProtocol.getLength())
         aRet.appendAscii("/");
     aRet.append(rParentPartical);
-    if(rParentPartical.getLength())
+    if( !rParentPartical.isEmpty() )
         aRet.appendAscii(":");
 
     aRet.append(getStringForType( eObjectType ));
@@ -725,7 +725,7 @@ bool ObjectIdentifier::isDragableObject(
             return true;
         default:
             OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( rClassifiedIdentifier ) );
-            if( aDragMethodServiceName.getLength() )
+            if( !aDragMethodServiceName.isEmpty() )
                 return true;
             return false;
     }
@@ -788,7 +788,7 @@ bool ObjectIdentifier::areSiblings( cons
     else
     {
         OUString aParent1( ObjectIdentifier::getFullParentParticle( rCID1 ) );
-        if( aParent1.getLength() )
+        if( !aParent1.isEmpty() )
         {
             OUString aParent2( ObjectIdentifier::getFullParentParticle( rCID2 ) );
             bRet=aParent1.equals(aParent2);
@@ -816,7 +816,7 @@ bool ObjectIdentifier::areIdenticalObjec
 
         OUString aID1( ObjectIdentifier::getObjectID( rCID1 ) );
         OUString aID2( ObjectIdentifier::getObjectID( rCID2 ) );
-        if( aID1.getLength() &&  aID1.equals( aID2 ) )
+        if( !aID1.isEmpty() &&  aID1.equals( aID2 ) )
             return true;
         }
     return false;
@@ -1016,9 +1016,9 @@ OUString ObjectIdentifier::addChildParti
 {
     OUStringBuffer aRet(rParticle);
     
-    if( aRet.getLength() && rChildParticle.getLength() )
+    if( aRet.getLength() && !rChildParticle.isEmpty() )
         aRet.appendAscii(":");
-    if( rChildParticle.getLength() )
+    if( !rChildParticle.isEmpty() )
         aRet.append(rChildParticle);
 
     return aRet.makeStringAndClear();
@@ -1109,7 +1109,7 @@ OUString ObjectIdentifier::getObjectID( 
 
 bool ObjectIdentifier::isCID( const OUString& rName )
 {
-    return rName.getLength() && rName.match( m_aProtocol );
+    return !rName.isEmpty() && rName.match( m_aProtocol );
 }
 
 Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
@@ -1125,7 +1125,7 @@ Reference< beans::XPropertySet > ObjectI
                 , const Reference< frame::XModel >& xChartModel )
 {
     //return the model object that is indicated by rObjectCID
-    if(!rObjectCID.getLength())
+    if(rObjectCID.isEmpty())
         return NULL;
     if(!xChartModel.is())
         return NULL;
@@ -1411,7 +1411,7 @@ bool ObjectIdentifier::isValid() const
 
 bool ObjectIdentifier::isAutoGeneratedObject() const
 {
-    return ( m_aObjectCID.getLength() > 0 );
+    return ( !m_aObjectCID.isEmpty() );
 }
 
 bool ObjectIdentifier::isAdditionalShape() const

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/PropertyHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/PropertyHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/PropertyHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/PropertyHelper.cxx Wed Mar 19 10:14:42 2014
@@ -135,14 +135,14 @@ OUString lcl_addNamedPropertyUniqueNameT
             OUString aUniqueName;
 
             // check if preferred name is already used
-            if( rPreferredName.getLength())
+            if( !rPreferredName.isEmpty() )
             {
                 aIt = ::std::find( aNames.begin(), aNames.end(), rPreferredName );
                 if( aIt == aNames.end())
                     aUniqueName = rPreferredName;
             }
 
-            if( ! aUniqueName.getLength())
+            if( aUniqueName.isEmpty() )
             {
                 // create a unique id using the prefix plus a number
                 ::std::vector< sal_Int32 > aNumbers;
@@ -161,7 +161,7 @@ OUString lcl_addNamedPropertyUniqueNameT
                 aUniqueName = rPrefix + OUString::valueOf( nIndex );
             }
 
-            OSL_ASSERT( aUniqueName.getLength());
+            OSL_ASSERT( !aUniqueName.isEmpty() );
             xNameContainer->insertByName( aUniqueName, rValue );
             return aUniqueName;
         }

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/RangeHighlighter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/RangeHighlighter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/RangeHighlighter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/RangeHighlighter.cxx Wed Mar 19 10:14:42 2014
@@ -111,7 +111,7 @@ void RangeHighlighter::determineRanges()
 
                 OUString aCID;
                 aSelection >>= aCID;
-                if ( aCID.getLength() > 0 )
+                if ( !aCID.isEmpty() )
                 {
                     ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
                     sal_Int32 nIndex = ObjectIdentifier::getIndexFromParticleOrCID( aCID );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/RegressionCurveHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/RegressionCurveHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/RegressionCurveHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/RegressionCurveHelper.cxx Wed Mar 19 10:14:42 2014
@@ -374,7 +374,7 @@ void RegressionCurveHelper::addRegressio
     uno::Reference< chart2::XRegressionCurve > xCurve;
     ::rtl::OUString aServiceName( lcl_getServiceNameForType( eType ));
 
-    if( aServiceName.getLength())
+    if( !aServiceName.isEmpty() )
     {
         // todo: use a valid context
         xCurve.set( createRegressionCurveByServiceName(
@@ -484,7 +484,7 @@ void RegressionCurveHelper::replaceOrAdd
     else
     {
         OUString aServiceName( lcl_getServiceNameForType( eType ));
-        if( aServiceName.getLength())
+        if( !aServiceName.isEmpty() )
         {
             RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCnt );
             RegressionCurveHelper::addRegressionCurve(

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/WrappedProperty.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/WrappedProperty.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/WrappedProperty.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/WrappedProperty.cxx Wed Mar 19 10:14:42 2014
@@ -90,7 +90,7 @@ Any WrappedProperty::getPropertyValue( c
 void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
                         throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
-    if( xInnerPropertyState.is() && this->getInnerName().getLength() )
+    if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() )
         xInnerPropertyState->setPropertyToDefault(this->getInnerName());
     else
     {
@@ -116,7 +116,7 @@ beans::PropertyState WrappedProperty::ge
 {
     beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE;
     rtl::OUString aInnerName( this->getInnerName() );
-    if( xInnerPropertyState.is() && aInnerName.getLength() )
+    if( xInnerPropertyState.is() && !aInnerName.isEmpty() )
         aState = xInnerPropertyState->getPropertyState( aInnerName );
     else
     {

Modified: openoffice/branches/alg_writerframes/main/chart2/source/tools/XMLRangeHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/tools/XMLRangeHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/tools/XMLRangeHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/tools/XMLRangeHelper.cxx Wed Mar 19 10:14:42 2014
@@ -270,7 +270,7 @@ bool lcl_getCellRangeAddressFromXMLStrin
         bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nEndPos,
                                                    rOutRange.aUpperLeft,
                                                    rOutRange.aTableName );
-        if( !rOutRange.aTableName.getLength() )
+        if( rOutRange.aTableName.isEmpty() )
             bResult = false;
     }
     else
@@ -279,7 +279,7 @@ bool lcl_getCellRangeAddressFromXMLStrin
         bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nDelimiterPos - 1,
                                                    rOutRange.aUpperLeft,
                                                    rOutRange.aTableName );
-        if( !rOutRange.aTableName.getLength() )
+        if( rOutRange.aTableName.isEmpty() )
             bResult = false;
 
         ::rtl::OUString sTableSecondName;
@@ -290,7 +290,7 @@ bool lcl_getCellRangeAddressFromXMLStrin
                                                        sTableSecondName );
         }
         if( bResult &&
-            sTableSecondName.getLength() &&
+            !sTableSecondName.isEmpty() &&
             ! sTableSecondName.equals( rOutRange.aTableName ))
             bResult = false;
     }
@@ -368,7 +368,7 @@ OUString getXMLStringFromCellRange( cons
 
     ::rtl::OUStringBuffer aBuffer;
 
-    if( (rRange.aTableName).getLength())
+    if( !rRange.aTableName.isEmpty())
     {
         bool bNeedsEscaping = ( rRange.aTableName.indexOf( aQuote ) > -1 );
         bool bNeedsQuoting = bNeedsEscaping || ( rRange.aTableName.indexOf( aSpace ) > -1 );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/axes/DateHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/axes/DateHelper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/axes/DateHelper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/axes/DateHelper.cxx Wed Mar 19 10:14:42 2014
@@ -78,9 +78,20 @@ Date DateHelper::GetDateSomeMonthsAway( 
 Date DateHelper::GetDateSomeYearsAway( const Date& rD, long nYearDistance )
 {
     Date aRet(rD);
-    aRet.SetYear( static_cast<sal_uInt16>(rD.GetYear()+nYearDistance) );
-    while(!aRet.IsValid())
-        aRet--;
+    const long nFutureYear (rD.GetYear()+nYearDistance);
+    aRet.SetYear(static_cast<sal_uInt16>(nFutureYear));
+    if ( ! aRet.IsValid())
+    {
+        // The Date class has the nasty property to store years modulo
+        // 10000.  In order to handle (probably invalid) very large
+        // year values more gracefully than with an infinite loop we
+        // check that condition and return an invalid date.
+        if (nFutureYear < 10000)
+        {
+            while ( ! aRet.IsValid())
+                --aRet;
+        }
+    }
     return aRet;
 }
 

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/axes/Tickmarks_Dates.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/axes/Tickmarks_Dates.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/axes/Tickmarks_Dates.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/axes/Tickmarks_Dates.cxx Wed Mar 19 10:14:42 2014
@@ -105,6 +105,7 @@ void DateTickFactory::getAllTicks( ::std
             break;
 
         //find next major date
+        const Date aTmpDate (aDate);
         switch( m_aIncrement.MajorTimeInterval.TimeUnit )
         {
         case DAY:
@@ -118,6 +119,8 @@ void DateTickFactory::getAllTicks( ::std
             aDate = DateHelper::GetDateSomeMonthsAway( aDate, m_aIncrement.MajorTimeInterval.Number );
             break;
         }
+        if ( ! aDate.IsValid() || aDate == aTmpDate)
+            break;
     }
 
     //create minor date tickinfos
@@ -136,6 +139,7 @@ void DateTickFactory::getAllTicks( ::std
             break;
 
         //find next minor date
+        const Date aTmpDate (aDate);
         switch( m_aIncrement.MinorTimeInterval.TimeUnit )
         {
         case DAY:
@@ -149,6 +153,8 @@ void DateTickFactory::getAllTicks( ::std
             aDate = DateHelper::GetDateSomeMonthsAway( aDate, m_aIncrement.MinorTimeInterval.Number );
             break;
         }
+        if ( ! aDate.IsValid() || aDate == aTmpDate)
+            break;
     }
 }
 

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/axes/VCartesianAxis.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/axes/VCartesianAxis.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/axes/VCartesianAxis.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/axes/VCartesianAxis.cxx Wed Mar 19 10:14:42 2014
@@ -96,7 +96,7 @@ Reference< drawing::XShape > createSingl
           , const tAnySequence& rPropValues
           )
 {   
-    if(!rLabel.getLength())
+    if( rLabel.isEmpty() )
         return 0;
 
     // #i78696# use mathematically correct rotation now

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/charttypes/VSeriesPlotter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/charttypes/VSeriesPlotter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/charttypes/VSeriesPlotter.cxx Wed Mar 19 10:14:42 2014
@@ -520,7 +520,7 @@ uno::Reference< drawing::XShape > VSerie
             {
                 OUString aNumber( this->getLabelTextForValue( rDataSeries
                     , nPointIndex, fValue, false /*bAsPercentage*/ ) );
-                if( aNumber.getLength() )
+                if( !aNumber.isEmpty() )
                 {
                     if(aText.getLength())
                         aText.append(aSeparator);
@@ -539,7 +539,7 @@ uno::Reference< drawing::XShape > VSerie
 
                 OUString aPercentage( this->getLabelTextForValue( rDataSeries
                     , nPointIndex, fValue, true /*bAsPercentage*/ ) );
-                if( aPercentage.getLength() )
+                if( !aPercentage.isEmpty() )
                 {
                     if(aText.getLength())
                         aText.append(aSeparator);
@@ -2152,7 +2152,7 @@ std::vector< ViewLegendEntry > VSeriesPl
 
                 // label
                 aLabelText = aCategoryNames[nIdx];
-                if( xShape.is() || aLabelText.getLength() )
+                if( xShape.is() || !aLabelText.isEmpty() )
                 {
                     aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aLabelText, xTextProperties );
                     aResult.push_back(aEntry);

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/main/ChartView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/main/ChartView.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/main/ChartView.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/main/ChartView.cxx Wed Mar 19 10:14:42 2014
@@ -1317,7 +1317,7 @@ void lcl_setDefaultWritingMode( ::boost:
                                             }
                                         }
                                     }
-                                    if( !aPageStyle.getLength() )
+                                    if( aPageStyle.isEmpty() )
                                     {
                                         uno::Reference< text::XText > xText( xTextDocument->getText() ); 
                                         if( xText.is() )
@@ -1332,7 +1332,7 @@ void lcl_setDefaultWritingMode( ::boost:
                                 {
                                     //Calc is parent document
                                     xParentProps->getPropertyValue( C2U("PageStyle") ) >>= aPageStyle;
-                                    if(!aPageStyle.getLength())
+                                    if( aPageStyle.isEmpty() )
                                         aPageStyle = C2U("Default");
                                 }
                                 if( nWritingMode == -1 || nWritingMode == text::WritingMode2::PAGE )
@@ -2225,7 +2225,7 @@ std::auto_ptr<VTitle> lcl_createTitle( T
 
     uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, xChartModel ) );
     rtl::OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) );
-    if( aCompleteString.getLength() != 0 )
+    if( !aCompleteString.isEmpty() )
     {
         //create title
         apVTitle = std::auto_ptr<VTitle>(new VTitle(xTitle));
@@ -2799,7 +2799,7 @@ void ChartView::Notify( SfxBroadcaster& 
             ::rtl::OUString aSelObjCID;
             uno::Any aSelObj( xSelectionSupplier->getSelection() );
             aSelObj >>= aSelObjCID;
-            if ( aSelObjCID.getLength() > 0 )
+            if ( !aSelObjCID.isEmpty() )
             {
                 return;
             }

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/main/DrawModelWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/main/DrawModelWrapper.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/main/DrawModelWrapper.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/main/DrawModelWrapper.cxx Wed Mar 19 10:14:42 2014
@@ -361,7 +361,7 @@ XBitmapListSharedPtr DrawModelWrapper::G
 
 SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName )
 {
-    if(rName.getLength()==0)
+    if( rName.isEmpty() )
         return 0;
     return getNamedSdrObject( rName, GetPage(0) );
 }

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/main/ShapeFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/main/ShapeFactory.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/main/ShapeFactory.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/main/ShapeFactory.cxx Wed Mar 19 10:14:42 2014
@@ -1929,7 +1929,7 @@ uno::Reference< drawing::XShapes >
         xTarget->add(xShape);
 
         //set name
-        if(aName.getLength())
+        if( !aName.isEmpty() )
             setShapeName( xShape , aName );
 
         {//workaround
@@ -1987,7 +1987,7 @@ uno::Reference< drawing::XShapes >
         }
 
         //set name
-        if(aName.getLength())
+        if( !aName.isEmpty() )
             setShapeName( xShape , aName );
 
         //return
@@ -2244,7 +2244,7 @@ uno::Reference< drawing::XShape >
     if( !xTarget.is() )
         return 0;
 
-    if(!rText.getLength())
+    if( rText.isEmpty() )
         return 0;
 
     //create shape and add to page

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/main/VLegend.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/main/VLegend.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/main/VLegend.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/main/VLegend.cxx Wed Mar 19 10:14:42 2014
@@ -205,7 +205,7 @@ awt::Size lcl_createTextShapes(
                 Reference< text::XTextRange > xRange( xEntry, uno::UNO_QUERY );
                 OUString aLabelString( aLabelSeq[i]->getString());
                 // workaround for Issue #i67540#
-                if( !aLabelString.getLength())
+                if( aLabelString.isEmpty() )
                     aLabelString = C2U(" ");
                 if( xRange.is())
                     xRange->setString( aLabelString );

Modified: openoffice/branches/alg_writerframes/main/chart2/source/view/main/VTitle.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/chart2/source/view/main/VTitle.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/chart2/source/view/main/VTitle.cxx (original)
+++ openoffice/branches/alg_writerframes/main/chart2/source/view/main/VTitle.cxx Wed Mar 19 10:14:42 2014
@@ -169,7 +169,7 @@ void VTitle::createShapes(
             ////aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameHeight"), uno::makeAny(rSize.Height) ) ); //sal_Int32
 
             //set name/classified ObjectID (CID)
-            if( m_aCID.getLength() )
+            if( !m_aCID.isEmpty() )
                 aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( m_aCID ) ) ); //CID rtl::OUString
         }
 

Modified: openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbamaker.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbamaker.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbamaker.cxx (original)
+++ openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbamaker.cxx Wed Mar 19 10:14:42 2014
@@ -167,7 +167,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 					} else
 					{
 						tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-						if (tmpName.getLength() == 0) 
+						if ( tmpName.isEmpty() )
 							tmpName = "/";
 						else
 							tmpName.replace('.', '/');

Modified: openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbatype.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbatype.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbatype.cxx (original)
+++ openoffice/branches/alg_writerframes/main/codemaker/source/bonobowrappermaker/corbatype.cxx Wed Mar 19 10:14:42 2014
@@ -104,7 +104,7 @@ sal_Bool CorbaType::dumpDependedTypes(Co
 		if ((index = typeName.lastIndexOf(']')) > 0)
 			typeName = typeName.copy(index + 1);
 		
-		if (getUnoBaseType(typeName).getLength() == 0)
+		if ( getUnoBaseType(typeName).isEmpty() )
 		{
 			if (!produceType(typeName,
 				m_typeMgr,
@@ -302,7 +302,7 @@ void CorbaType::dumpInclude(FileStream& 
 					realTypeName = "";	
 				}
 			}
-			while (realTypeName.getLength() > 0);
+			while ( !realTypeName.isEmpty() );
 
 			o << "}; // namespace bonobobridge\n";
 		}
@@ -341,8 +341,8 @@ void CorbaType::dumpDepIncludes(FileStre
 				bSequenceDumped = sal_True;
 			}
 			
-			if (getUnoBaseType(relType).getLength() == 0 &&
-				m_typeName != relType)
+			if ( getUnoBaseType(relType).isEmpty() &&
+				 m_typeName != relType)
 			{
 				if (m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE
 					&& sPrefix.equals("HDL"))
@@ -377,7 +377,7 @@ void CorbaType::dumpNameSpace(FileStream
 {
 	OString typeName(type);
 	sal_Bool bOneLine = sal_True; 
-	if (typeName.getLength() == 0)
+	if ( typeName.isEmpty() )
 	{
 		typeName = m_typeName;
 		bOneLine = sal_False;
@@ -448,7 +448,7 @@ sal_uInt32 CorbaType::checkInheritedMemb
 
 	sal_uInt32 count = 0;
 	OString superType(pReader->getSuperTypeName());
-	if (superType.getLength() > 0)
+	if ( !superType.isEmpty() )
 	{
 		TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
 		if ( aSuperReader.isValid() )
@@ -486,10 +486,10 @@ sal_uInt32 CorbaType::getInheritedMember
 
 OString	CorbaType::getTypeClass(const OString& type, sal_Bool bCStyle)
 {
-	OString 	typeName = (type.getLength() > 0 ? type : m_typeName);
+	OString 	typeName = ( !type.isEmpty() ? type : m_typeName);
 	RTTypeClass	rtTypeClass = RT_TYPE_INVALID;
 
-	if (type.getLength() > 0)
+	if ( !type.isEmpty() )
 	{
 		typeName = type;
 		rtTypeClass = m_typeMgr.getTypeClass(typeName);
@@ -599,7 +599,7 @@ OString CorbaType::printUnoType(const OS
 	case RT_TYPE_INVALID:
 	{
 		OString tmp(getUnoBaseType(relType));
-		if (tmp.getLength() > 0)
+		if ( !tmp.isEmpty() )
 		{
 			ret.append(getUnoBaseType(relType));
 		} else
@@ -674,7 +674,7 @@ OString CorbaType::printCorbaType(const 
 	case RT_TYPE_INVALID:
 	{
 		OString tmp(getUnoBaseType(relType));
-		if (tmp.getLength() > 0)
+		if ( !tmp.isEmpty() )
 			ret.append(getCorbaBaseType(relType));
 		else
 			throw CannotDumpException("Unknown type '" + relType + "', incomplete type library. ("+type+")");
@@ -749,7 +749,7 @@ sal_Bool CorbaType::isPassedAsPointer(co
 sal_Bool CorbaType::isDerivedFromUnknown(const ::rtl::OString& typeName)
 {
 	sal_Bool ret = sal_True;
-	if (typeName.getLength() == 0)
+	if ( typeName.isEmpty() )
 		ret = sal_False;
 	else if (typeName.equals("Bonobo/NullInterface"))
 		ret = sal_False;
@@ -839,7 +839,7 @@ OString CorbaType::printCorbaParameter(c
 	case RT_TYPE_INVALID:
 	{
 		OString tmp(getUnoBaseType(relType));
-		if (tmp.getLength() > 0)
+		if ( !tmp.isEmpty() )
 		{
 			ret.append(getCorbaBaseType(relType));
 		} else
@@ -1824,7 +1824,7 @@ void InterfaceType::dumpFunctions(FileSt
 
 	initBuffer.insert(0, OString("&bonobobridge_") + printCorbaType(m_typeName, sal_False, sal_False) + OString("_epv"));
 
-	while(superName.getLength() != 0)
+	while( !superName.isEmpty() )
 	{
 		if (superName.equals("Bonobo/NullInterface"))
 		{
@@ -1996,7 +1996,7 @@ sal_uInt32 InterfaceType::checkInherited
 
 	sal_uInt32 count = 0;
 	OString superType(pReader->getSuperTypeName());
-	if (superType.getLength() > 0)
+	if ( !superType.isEmpty() )
 	{
 		TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
 		if (aSuperReader.isValid())
@@ -2162,7 +2162,7 @@ void StructureType::dumpFunctions(FileSt
 	}
 	else
 	{
-		if (superType.getLength() > 0)
+		if ( !superType.isEmpty() )
 		{
 			o << "  ret = bonobobridge::cpp_convert_b2u((";
 			dumpUnoType(o, superType, sal_False, sal_False);
@@ -2210,7 +2210,7 @@ void StructureType::dumpFunctions(FileSt
 		o << "  // fix me: union !!!!\n  ret = sal_False;\n";
 	else
 	{
-		if (superType.getLength() > 0)
+		if ( !superType.isEmpty() )
 		{
 			o << "  ret = bonobobridge::cpp_convert_u2b((";
 			dumpCorbaType(o, superType, sal_False, sal_False);
@@ -2268,7 +2268,7 @@ sal_Bool StructureType::dumpSuperMember(
 {
 	sal_Bool hasMember = sal_False;
 
-	if (superType.getLength() > 0)
+	if ( !superType.isEmpty() )
 	{
 		TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
 		
@@ -2359,7 +2359,7 @@ void ExceptionType::dumpFunctions(FileSt
 	sal_Int32    cIndex;
 	OString      corbaFieldName;
 
-	if (superType.getLength() > 0)
+	if ( !superType.isEmpty() )
 	{
 		o << "  ret = bonobobridge::cpp_convert_b2u((";
 		dumpUnoType(o, superType, sal_False, sal_False);
@@ -2404,7 +2404,7 @@ void ExceptionType::dumpFunctions(FileSt
 	dumpCorbaType(o, m_typeName, sal_False, sal_False);
 	o << "*) pOut;\n\n";
 
-	if (superType.getLength() > 0)
+	if ( !superType.isEmpty() )
 	{
 		o << "  ret = bonobobridge::cpp_convert_u2b((";
 		dumpCorbaType(o, superType, sal_False, sal_False);
@@ -2463,7 +2463,7 @@ sal_Bool ExceptionType::dumpSuperMember(
 {
 	sal_Bool hasMember = sal_False;
 
-	if (superType.getLength() > 0)
+	if ( !superType.isEmpty() )
 	{
 		TypeReader aSuperReader(m_typeMgr.getTypeReader(superType));
 		

Modified: openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/global.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/global.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/global.cxx (original)
+++ openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/global.cxx Wed Mar 19 10:14:42 2014
@@ -113,7 +113,7 @@ OString createFileNameFromType( const OS
 		nameBuffer.append("/", 1);
 
 	OString tmpStr(type);
-	if (prefix.getLength() > 0)
+	if ( !prefix.isEmpty() )
 	{
 		tmpStr = type.replaceAt(type.lastIndexOf('/')+1, 0, prefix);
 	}
@@ -295,7 +295,7 @@ FileStream::FileStream()
 FileStream::FileStream(const OString& name, FileAccessMode mode)
 	: m_file(NULL)
 {
-    if ( name.getLength() > 0 )
+    if ( !name.isEmpty() )
     {
         OUString sUrl(convertToFileUrl(name));
 #ifdef SAL_UNX        
@@ -335,7 +335,7 @@ void FileStream::createTempFile(const OS
     OUString sTmpPath;
     OUString sTmpName;
 
-    if (sPath.getLength() > 0)
+    if ( !sPath.isEmpty() )
         sTmp = sPath;
 
     sTmpPath = convertToFileUrl(sTmp);
@@ -361,7 +361,7 @@ void FileStream::createTempFile(const OS
 
 void FileStream::open(const OString& name, FileAccessMode mode)
 {
-	if ( name.getLength() > 0 )
+	if ( !name.isEmpty() )
 	{
         oslFileError ret =  osl_File_E_None;
         if ((ret = osl_openFile(convertToFileUrl(name).pData, &m_file, checkAccessMode(mode))) == osl_File_E_None)

Modified: openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/unotype.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/unotype.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/unotype.cxx (original)
+++ openoffice/branches/alg_writerframes/main/codemaker/source/codemaker/unotype.cxx Wed Mar 19 10:14:42 2014
@@ -53,7 +53,7 @@ codemaker::UnoType::Sort codemaker::UnoT
 }
 
 bool codemaker::UnoType::isSequenceType(rtl::OString const & type) {
-    return type.getLength() > 0 && type[0] == '[';
+    return ( !type.isEmpty() && type[0] == '[' );
 }
 
 rtl::OString codemaker::UnoType::decompose(

Modified: openoffice/branches/alg_writerframes/main/codemaker/source/cppumaker/cppumaker.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/codemaker/source/cppumaker/cppumaker.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/codemaker/source/cppumaker/cppumaker.cxx (original)
+++ openoffice/branches/alg_writerframes/main/codemaker/source/cppumaker/cppumaker.cxx Wed Mar 19 10:14:42 2014
@@ -198,7 +198,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 					} else
 					{
 						tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-						if (tmpName.getLength() == 0) 
+						if ( tmpName.isEmpty() )
 							tmpName = "/";
 						else
 							tmpName.replace('.', '/');



Mime
View raw message