[Libreoffice-commits] .: framework/source svx/source
framework/source/accelerators/globalacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/moduleacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/presethandler.cxx | 12
+-
framework/source/services/autorecovery.cxx | 10
svx/source/unodraw/unoshcol.cxx |4 +--
5 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit f58c49b39a7c6a8490033360f78768ee0a26f167
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 2 22:53:48 2012 +0100
Some cppcheck cleaning
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 84da269..c5853f8 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -119,8 +119,8 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster-addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 9c3fb8f..7100685 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -153,8 +153,8 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster-addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index d276b48..b68fdc4 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -501,8 +501,8 @@ void PresetHandler::connectToResource(
PresetHandler::EConfigType
xUser = m_lDocumentStorages.openPath(sRelPathUser , eUserMode
);
xShare = xUser;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ xShare.clear(); xUser.clear(); }
}
@@ -822,8 +822,8 @@ css::uno::Reference css::embed::XStorage
PresetHandler::impl_openPathIgnoring
else
xPath = m_aSharedStorages-m_lStoragesUser.openPath(sPath, eMode);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ xPath.clear(); }
return xPath;
@@ -921,8 +921,8 @@ css::uno::Reference css::embed::XStorage
PresetHandler::impl_openLocalizedPat
if (xFolder-isStorageElement(pNames[i]))
lSubFolders.push_back(pNames[i]);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 6d2b6b6..cae935b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1336,7 +1336,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = 0;
}
-catch(const css::uno::Exception ex)
+catch(const css::uno::Exception)
{
// a) FULL DISC seams to be the problem behind
= show error and retry it forever (e.g. retry=300)
// b) unknown problem (may be locking problem)
= reset RETRY value to more usefull value(!) (e.g. retry=3)
@@ -1355,7 +1355,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
else
if (nRetry = GIVE_UP_RETRY)
-throw ex; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
+throw; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
--nRetry;
}
@@ -2374,7 +2374,7 @@ void
[Libreoffice-commits] .: framework/source svx/source
framework/source/uielement/controlmenucontroller.cxx |4 ++--
svx/source/form/fmshimp.cxx | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 5f2355014375adb66dd8e986068abc8429e0ad0d
Author: Matúš Kukan matus.ku...@gmail.com
Date: Wed Jan 4 21:58:46 2012 +0100
make these variables static
diff --git a/framework/source/uielement/controlmenucontroller.cxx
b/framework/source/uielement/controlmenucontroller.cxx
index a946858..1f5e64e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -115,7 +115,7 @@
#define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12)
#define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13)
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -139,7 +139,7 @@ sal_Int16 nConvertSlots[] =
SID_FM_CONVERTTO_SPINBUTTON
};
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
{
SID_FM_EDIT,
SID_FM_PUSHBUTTON,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e261c21..04751bb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -117,7 +117,7 @@
#include vector
// wird fuer Invalidate verwendet - mitpflegen
-sal_uInt16 DatabaseSlotMap[] =
+static sal_uInt16 DatabaseSlotMap[] =
{
SID_FM_RECORD_FIRST,
SID_FM_RECORD_NEXT,
@@ -145,7 +145,7 @@ sal_uInt16 DatabaseSlotMap[] =
// wird fuer Invalidate verwendet - mitpflegen
// aufsteigend sortieren !!
-sal_Int16 DlgSlotMap[] =// slots des Controllers
+static sal_Int16 DlgSlotMap[] =// slots des Controllers
{
SID_FM_CTL_PROPERTIES,
SID_FM_PROPERTIES,
@@ -161,7 +161,7 @@ sal_Int16 DlgSlotMap[] =// slots des Controllers
0
};
-sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige Slots
+static sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige Slots
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -192,7 +192,7 @@ sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige
Slots
// die folgenden Arrays muessen kosistent sein, also einander entsprechende
Eintraege an der selben relativen Position
// innerhalb ihres jeweiligen Arrays stehen
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -216,7 +216,7 @@ sal_Int16 nConvertSlots[] =
SID_FM_CONVERTTO_NAVIGATIONBAR
};
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
{
SID_FM_EDIT,
SID_FM_PUSHBUTTON,
@@ -240,7 +240,7 @@ sal_Int16 nCreateSlots[] =
SID_FM_NAVIGATIONBAR
};
-sal_Int16 nObjectTypes[] =
+static sal_Int16 nObjectTypes[] =
{
OBJ_FM_EDIT,
OBJ_FM_BUTTON,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
