diff options
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/winpluginlib.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 46d3053db8f7..d5322e599c45 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -74,7 +74,7 @@ const sal_uInt16 COLORCOMP_KEY = 0x43; static void RGBtoHSV( double dR, double dG, double dB, double& dH, double& dS, double& dV ) { - BColor result = tools::rgb2hsv( BColor( dR, dG, dB ) ); + BColor result = basegfx::tools::rgb2hsv( BColor( dR, dG, dB ) ); dH = result.getX(); dS = result.getY(); @@ -83,7 +83,7 @@ static void RGBtoHSV( double dR, double dG, double dB, double& dH, double& dS, d static void HSVtoRGB(double dH, double dS, double dV, double& dR, double& dG, double& dB ) { - BColor result = tools::hsv2rgb( BColor( dH, dS, dV ) ); + BColor result = basegfx::tools::hsv2rgb( BColor( dH, dS, dV ) ); dR = result.getRed(); dG = result.getGreen(); diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx index 539137576c8e..46c4af2e7ab1 100644 --- a/cui/source/dialogs/winpluginlib.cxx +++ b/cui/source/dialogs/winpluginlib.cxx @@ -20,6 +20,8 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#undef WB_LEFT +#undef WB_RIGHT #include <windows.h> #if defined _MSC_VER #pragma warning(pop) |