summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-07-08 17:54:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-07-08 17:54:36 +0200
commitfeab17bc3626b5d1585d91ce006b4b9105483c1f (patch)
tree68d4ade425e9e1708d52e5749be8938d01863629 /svx
parentcc43153f466135b959605add37ccd9443852c185 (diff)
various warnings
Change-Id: Id3a56d628088f19424bd6e0c8bf23b0ac6c64d25
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.cxx56
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.hxx2
2 files changed, 29 insertions, 29 deletions
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index bfb1d0a8f73c..a027abc8ef92 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -28,6 +28,35 @@ using namespace css;
using namespace css::uno;
using sfx2::sidebar::Theme;
+namespace {
+
+sal_uInt32 ParseText(OUString const & sTmp)
+{
+ if (sTmp.isEmpty())
+ return 0;
+ sal_Unicode nChar = sTmp[0];
+ if( nChar == '-' )
+ {
+ if (sTmp.getLength() < 2)
+ return 0;
+ nChar = sTmp[1];
+ }
+
+ if( (nChar < '0') || (nChar > '9') )
+ return 0;
+
+ const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
+ const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
+
+ rtl_math_ConversionStatus eStatus;
+ double fTmp = rtl::math::stringToDouble( sTmp, cSep, 0, &eStatus);
+ if (eStatus != rtl_math_ConversionStatus_Ok)
+ return 0;
+
+ return fTmp;
+}
+
+}
namespace svx { namespace sidebar {
@@ -171,33 +200,6 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl)
return 0;
}
-sal_uInt32 ShadowPropertyPanel::ParseText(OUString sTmp)
-{
- if (sTmp.isEmpty())
- return 0;
- sal_Unicode nChar = sTmp[0];
- if( nChar == '-' )
- {
- if (sTmp.getLength() < 2)
- return 0;
- nChar = sTmp[1];
- }
-
- if( (nChar < '0') || (nChar > '9') )
- return 0;
-
- const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
- const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
-
- rtl_math_ConversionStatus eStatus;
- double fTmp = rtl::math::stringToDouble( sTmp, cSep, 0, &eStatus);
- if (eStatus != rtl_math_ConversionStatus_Ok)
- return 0;
-
- return fTmp;
-
-}
-
void ShadowPropertyPanel::UpdateControls()
{
if(mpShowShadow->GetState() == TRISTATE_FALSE)
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index c32f327232c9..520e03daba48 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -65,7 +65,6 @@ private:
VclPtr<Slider> mpShadowTransSlider;
VclPtr<MetricField> mpShadowTransMetric;
XColorListRef pColorList;
- bool bDisabled;
::sfx2::sidebar::ControllerItem maShadowController;
::sfx2::sidebar::ControllerItem maShadowTransController;
@@ -83,7 +82,6 @@ private:
void InsertAngleValues();
void SetTransparencyValue(long);
void UpdateControls();
- sal_uInt32 ParseText(OUString pStr);
DECL_LINK(ClickShadowHdl, void*);
DECL_LINK(ModifyShadowColorHdl, void*);
DECL_LINK(ModifyShadowTransMetricHdl, void*);