Kaydet (Commit) feab17bc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

various warnings

Change-Id: Id3a56d628088f19424bd6e0c8bf23b0ac6c64d25
üst cc43153f
...@@ -28,6 +28,35 @@ using namespace css; ...@@ -28,6 +28,35 @@ using namespace css;
using namespace css::uno; using namespace css::uno;
using sfx2::sidebar::Theme; 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 { namespace svx { namespace sidebar {
...@@ -171,33 +200,6 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl) ...@@ -171,33 +200,6 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl)
return 0; 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() void ShadowPropertyPanel::UpdateControls()
{ {
if(mpShowShadow->GetState() == TRISTATE_FALSE) if(mpShowShadow->GetState() == TRISTATE_FALSE)
......
...@@ -65,7 +65,6 @@ private: ...@@ -65,7 +65,6 @@ private:
VclPtr<Slider> mpShadowTransSlider; VclPtr<Slider> mpShadowTransSlider;
VclPtr<MetricField> mpShadowTransMetric; VclPtr<MetricField> mpShadowTransMetric;
XColorListRef pColorList; XColorListRef pColorList;
bool bDisabled;
::sfx2::sidebar::ControllerItem maShadowController; ::sfx2::sidebar::ControllerItem maShadowController;
::sfx2::sidebar::ControllerItem maShadowTransController; ::sfx2::sidebar::ControllerItem maShadowTransController;
...@@ -83,7 +82,6 @@ private: ...@@ -83,7 +82,6 @@ private:
void InsertAngleValues(); void InsertAngleValues();
void SetTransparencyValue(long); void SetTransparencyValue(long);
void UpdateControls(); void UpdateControls();
sal_uInt32 ParseText(OUString pStr);
DECL_LINK(ClickShadowHdl, void*); DECL_LINK(ClickShadowHdl, void*);
DECL_LINK(ModifyShadowColorHdl, void*); DECL_LINK(ModifyShadowColorHdl, void*);
DECL_LINK(ModifyShadowTransMetricHdl, void*); DECL_LINK(ModifyShadowTransMetricHdl, void*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment