impress210: merge DEV300 m100

16 files changed, 37 insertions, 41 deletions

diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 4d29833e637a..c512ab084da9 100755
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -645,7 +645,7 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n
         sal_Int32 nCategory = (rand() * pCategoryList->size() / RAND_MAX);
 
         PresetCategoryPtr pCategory = (*pCategoryList)[nCategory];
-        if( pCategory.get() && pCategory->maEffects.size() )
+        if( pCategory.get() && !pCategory->maEffects.empty() )
         {
             sal_Int32 nDescriptor = (rand() * pCategory->maEffects.size() / RAND_MAX);
             CustomAnimationPresetPtr pPreset = pCategory->maEffects[nDescriptor];
@@ -654,7 +654,7 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n
                 UStringList aSubTypes = pPreset->getSubTypes();
 
                 OUString aSubType;
-                if( aSubTypes.size() )
+                if( !aSubTypes.empty() )
                 {
                     sal_Int32 nSubType = (rand() * aSubTypes.size() / RAND_MAX);
                     aSubType = aSubTypes[nSubType];
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 52b9723bc178..80e29c69f706 100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1096,32 +1096,33 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
                 switch(i)
                 {
                     case 0:
-                    case 1:
                     {
                         nFontSize = 32;
                         nFirstLineOffset = -900;
                     }
                     break;
 
-                    case 2:
+                    case 1:
                     {
-                        nFontSize = 28;
-                        nFirstLineOffset = -800;
                         aNumberFormat.SetBulletChar( 0x2013 );  // StarBats: 0xF000 + 150
                         aNumberFormat.SetBulletRelSize(75);
+                        nFontSize = 32;
+                        nFirstLineOffset = -900;
                     }
                     break;
 
-                    case 3:
+                    case 2:
                     {
-                        nFontSize = 24;
+                        nFontSize = 28;
+                        nFirstLineOffset = -800;
                     }
                     break;
 
-                    case 4:
+                    case 3:
                     {
-                        aNumberFormat.SetBulletChar( 0x2013 ); // StarBats: 0xF000 + 150
+                        aNumberFormat.SetBulletChar( 0x2013 );  // StarBats: 0xF000 + 150
                         aNumberFormat.SetBulletRelSize(75);
+                        nFontSize = 24;
                     }
                     break;
                 }
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 6c766ed19fe3..5abc7eed6c43 100755
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -59,8 +59,6 @@
 #define PUB_HIGHRES_WIDTH   1024
 #define PUB_HIGHRES_HEIGHT  768
 
-#define HtmlButtonThemaStr = "private://gallery/hidden/HtmlExportButtons";
-
 class List;
 class SfxProgress;
 class SdrOutliner;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 73d595a8eb1e..b83285647256 100755
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2044,7 +2044,7 @@ void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTarge
 
 void CustomAnimationPane::onRemove()
 {
-    if( maListSelection.size() )
+    if( !maListSelection.empty() )
     {
         addUndo();
 
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index cea71438ee4f..dc10b355de27 100755
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -48,6 +48,8 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/saveopt.hxx>
 
+#include <tools/datetime.hxx>
+
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
@@ -152,11 +154,8 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
 
 com::sun::star::util::DateTime getCurrentDateTime()
 {
-    TimeValue osltime;
-    osl_getSystemTime( &osltime );
-    oslDateTime osldt;
-    osl_getDateTimeFromTimeValue( &osltime, &osldt );
-    return com::sun::star::util::DateTime( 0, osldt.Seconds, osldt.Minutes, osldt.Hours, osldt.Day, osldt.Month, osldt.Year );
+    DateTime aCurrentDate;
+    return com::sun::star::util::DateTime( 0, aCurrentDate.GetSec(), aCurrentDate.GetMin(), aCurrentDate.GetHour(), aCurrentDate.GetDay(), aCurrentDate.GetMonth(), aCurrentDate.GetYear() );
 }
 
 OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation )
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index aa93635c4032..2121ffbe2a50 100755
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -108,7 +108,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void)
 
     // Close the spell check dialog when there are no more sentences to
     // check.
-    if (aResult.size() == 0)
+    if (aResult.empty())
     {
         SfxBoolItem aItem (SID_SPELL_DIALOG, sal_False);
         GetBindings().GetDispatcher()->Execute(
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 074ab49d97bb..3e56f747766f 100755
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -907,7 +907,7 @@ void AssistentDlgImpl::TemplateScanDone (
 
         // HACK! presnt directory is always initially selected.
         // We have to look at the first entry to get a URL.
-        if (pDir->maEntries.size() > 0)
+        if (!pDir->maEntries.empty() )
         {
             TemplateEntry* pEntry = pDir->maEntries.front();
             if (pEntry != NULL)
@@ -932,7 +932,7 @@ void AssistentDlgImpl::TemplateScanDone (
 
         // HACK! layout directory is always initially selected.
         // We have to look at the first entry to get a URL.
-        if (pDir->maEntries.size() > 0)
+        if (!pDir->maEntries.empty() )
         {
             TemplateEntry* pEntry = pDir->maEntries.front();
             if (pEntry != NULL)
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index ff167f07520a..6056d434068c 100755
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -184,14 +184,14 @@ void ConfigurationControllerBroadcaster::DisposeAndClear (void)
 {
     lang::EventObject aEvent;
     aEvent.Source = mxConfigurationController;
-    while (maListenerMap.size() > 0)
+    while (!maListenerMap.empty())
     {
         ListenerMap::iterator iMap (maListenerMap.begin());
         if (iMap == maListenerMap.end())
             break;
 
         // When the first vector is empty then remove it from the map.
-        if (iMap->second.size() == 0)
+        if (iMap->second.empty())
         {
             maListenerMap.erase(iMap);
             continue;
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 4ab361a9490d..78d1e394c94a 100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -256,7 +256,7 @@ void ConfigurationUpdater::CleanRequestedConfiguration (void)
         // Request the deactivation of pure anchors that have no child.
         vector<Reference<XResourceId> > aResourcesToDeactivate;
         CheckPureAnchors(mxRequestedConfiguration, aResourcesToDeactivate);
-        if (aResourcesToDeactivate.size() > 0)
+        if (!aResourcesToDeactivate.empty() )
         {
             Reference<XConfigurationController> xCC (
                 mxControllerManager->getConfigurationController());
@@ -327,7 +327,7 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
         // Deactivate pure anchors that have no child.
         vector<Reference<XResourceId> > aResourcesToDeactivate;
         CheckPureAnchors(mxCurrentConfiguration, aResourcesToDeactivate);
-        if (aResourcesToDeactivate.size() > 0)
+        if (!aResourcesToDeactivate.empty() )
             mpResourceManager->DeactivateResources(aResourcesToDeactivate, mxCurrentConfiguration);
     }
     catch(RuntimeException)
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 15d7c3a6f4ec..25be1d1dfaf2 100755
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -183,7 +183,7 @@ OUString SAL_CALL
     ResourceId::getResourceURL (void)
     throw(com::sun::star::uno::RuntimeException)
 {
-    if (maResourceURLs.size() > 0)
+    if (!maResourceURLs.empty())
         return maResourceURLs[0];
     else
         return OUString();
@@ -200,7 +200,7 @@ util::URL SAL_CALL
         return *mpURL;
 
     Reference<util::XURLTransformer> xURLTransformer (mxURLTransformerWeak);
-    if (xURLTransformer.is() && maResourceURLs.size() > 0)
+    if (xURLTransformer.is() && !maResourceURLs.empty() )
     {
         mpURL.reset(new util::URL);
         mpURL->Complete = maResourceURLs[0];
@@ -209,7 +209,7 @@ util::URL SAL_CALL
     }
 
     util::URL aURL;
-    if (maResourceURLs.size() > 0)
+    if (!maResourceURLs.empty())
         aURL.Complete = maResourceURLs[0];
     return aURL;
 }
@@ -268,7 +268,7 @@ OUString SAL_CALL
     ResourceId::getResourceTypePrefix (void)
     throw (RuntimeException)
 {
-    if (maResourceURLs.size() > 0)
+    if (!maResourceURLs.empty() )
     {
         // Return the "private:resource/<type>/" prefix.
 
@@ -298,7 +298,7 @@ sal_Int16 SAL_CALL
     if ( ! rxResourceId.is())
     {
         // The empty reference is interpreted as empty resource id object.
-        if (maResourceURLs.size() > 0)
+        if (!maResourceURLs.empty())
             nResult = +1;
         else
             nResult = 0;
@@ -610,7 +610,7 @@ void ResourceId::ParseResourceURL (void)
             Reference<XInterface>(xURLTransformer,UNO_QUERY));
     }
 
-    if (xURLTransformer.is() && maResourceURLs.size() > 0)
+    if (xURLTransformer.is() && !maResourceURLs.empty() )
     {
         mpURL.reset(new util::URL);
         mpURL->Complete = maResourceURLs[0];
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 902c6f48a9a7..c9effbf121c2 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -523,7 +523,7 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r
     if (xResource.is())
     {
         static ::std::vector<Reference<XResourceId> > maCacheableResources;
-        if (maCacheableResources.size() == 0)
+        if (maCacheableResources.empty() )
         {
             ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
 
diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src
index 78cd2aae0d9f..0b6217028d91 100755
--- a/sd/source/ui/slideshow/slideshow.src
+++ b/sd/source/ui/slideshow/slideshow.src
@@ -74,7 +74,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU
         MenuItem
         {
             Identifier = CM_PEN_MODE;
-            Text [ en-US ] = "Mouse pointer as ~pen";
+            Text [ en-US ] = "Mouse pointer as ~Pen";
         };
         MenuItem
         {
@@ -115,12 +115,12 @@ Menu RID_SLIDESHOW_CONTEXTMENU
         MenuItem
         {
             Identifier = CM_COLOR_PEN ;
-            Text [ en-US ] = "~Change Pen Color..." ;
+            Text [ en-US ] = "~Change pen Color..." ;
         };
         MenuItem
         {
             Identifier = CM_ERASE_ALLINK ;
-            Text [ en-US ] = "~Erase All Ink On Slide" ;
+            Text [ en-US ] = "~Erase all ink on Slide" ;
         };
         MenuItem
         {
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 28756b3766d9..dfc672e33802 100755
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -303,7 +303,7 @@ IMPL_LINK(Animator, TimeoutHandler, Timer*, EMPTYARG)
     // Unlock the draw lock.  This should lead to a repaint.
     mpDrawLock.reset();
 
-    if (maAnimations.size() > 0)
+    if (!maAnimations.empty())
         RequestNextFrame();
 
     return 0;
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
index 8ed46a90dbba..3bff5f5e7a4b 100755
--- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
+++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
@@ -338,7 +338,7 @@ void DocumentHelper::AssignMasterPageToPageList (
                 aCleanedList.push_back(*iPage);
             }
         }
-        if (aCleanedList.size() == 0)
+        if (aCleanedList.empty() )
             break;
 
         ::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 7f67a549fc10..d6fbc27d9b3f 100755
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1949,7 +1949,6 @@ private:
 
         // Distribute pages to handout pages.
         ::std::vector<sal_uInt16> aPageIndices;
-        std::vector<SdPage*> aPagesVector;
         for (sal_uInt16
                  nIndex=0,
                  nCount= nPageCount,
@@ -1966,8 +1965,7 @@ private:
 
             // Create a printer page when we have found one page for each
             // placeholder or when this is the last (and special) loop.
-            if (aPageIndices.size() == nShapeCount
-                || nIndex==nCount)
+            if (!aPageIndices.empty() && (aPageIndices.size() == nShapeCount || nIndex==nCount))
             {
                 maPrinterPages.push_back(
                     ::boost::shared_ptr<PrinterPage>(
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 0c0cd2b9836e..fa0c699778c1 100755
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -486,7 +486,7 @@ int ViewTabBar::GetHeight (void)
 {
     int nHeight (0);
 
-    if (maTabBarButtons.size() > 0)
+    if (!maTabBarButtons.empty())
     {
         TabPage* pActivePage (mpTabControl->GetTabPage(
             mpTabControl->GetCurPageId()));