summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorOcke.Janssen@oracle.com <Ocke.Janssen@oracle.com>2011-12-06 01:28:00 +0100
committerThorsten Behrens <tbehrens@suse.com>2011-12-06 09:39:08 +0100
commit9753031300bb9bd61bbba2f617900422cdbde1ff (patch)
tree3145fbd0b22e89a0ae9607e90ac5d58043784d33 /sd
parent0851453849d36e5f58be24316d9bf910ee12faf8 (diff)
impress210: #i105310# set tooltip for items and some refactoring
# HG changeset patch # User Ocke.Janssen@oracle.com # Date 1297164555 -3600 # Node ID 902597eed5414555107034f62583c4ccc2cdfd4b # Parent 2f0f385e8b25938777bb9fed6a86a2ff43e0b7cd impress210: #i105310# set tooltip for items and some refactoring
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/dlg/SpellDialogChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx12
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/DocumentHelper.cxx2
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx2
10 files changed, 18 insertions, 18 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 21aae84e8ccb..feab1338853c 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -630,7 +630,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];
@@ -639,7 +639,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/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 7dd2966d7b5e..bb166818a77f 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2036,7 +2036,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/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index 5616a501d6cb..0d984d5d916f 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -107,7 +107,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 eb885b64fc0e..3c0c3e3abe00 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -902,7 +902,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)
@@ -927,7 +927,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 6e2610643e9f..ec03006920b3 100644
--- 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/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index deb46b036e70..2957dfae7671 100644
--- 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 830e226a62db..3159e6bcce66 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -524,7 +524,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/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 164ed23dfa5e..47a1d173312f 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -273,7 +273,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 74dd8d4cedb1..25c60ebf92de 100644
--- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
+++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
@@ -335,7 +335,7 @@ void DocumentHelper::AssignMasterPageToPageList (
aCleanedList.push_back(*iPage);
}
}
- if (aCleanedList.size() == 0)
+ if (aCleanedList.empty() )
return;
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 384f021aa26a..082c78939e37 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -481,7 +481,7 @@ int ViewTabBar::GetHeight (void)
{
int nHeight (0);
- if (maTabBarButtons.size() > 0)
+ if (!maTabBarButtons.empty())
{
TabPage* pActivePage (mpTabControl->GetTabPage(
mpTabControl->GetCurPageId()));