[Libreoffice-commits] core.git: svx/inc svx/source
David Tardon
dtardon at redhat.com
Mon Apr 1 22:39:47 PDT 2013
svx/inc/svx/graphichelper.hxx | 5 +----
svx/source/core/graphichelper.cxx | 4 +++-
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit f38c4f138c6ec810b26fcf2064f64e64eb14129b
Author: David Tardon <dtardon at redhat.com>
Date: Tue Apr 2 07:34:56 2013 +0200
try to fix windows tb with pch
C:/lo/gerrit_core/solver/wntmsci13.pro/inc\vcl/lineinfo.hxx(39) : error C2872: 'LineStyle' : ambiguous symbol
could be 'C:/lo/gerrit_core/solver/wntmsci13.pro/inc\vcl/vclenum.hxx(80) : LineStyle'
or 'C:/lo/gerrit_core/solver/wntmsci13.pro/inc/offapi om/sun/star/drawing/LineStyle.hdl(13) : com::sun::star::drawing::LineStyle'
...
make[1]: *** [C:/lo/gerrit_core/workdir/wntmsci13.pro/PrecompiledHeader/nodebug/precompiled_sd.hxx.gch] Error 2
WTH do we have 'using namespace' in _new_ code, anyway?
Change-Id: If149653f0a7a4a0061f48e866b30ced120f8bc5e
diff --git a/svx/inc/svx/graphichelper.hxx b/svx/inc/svx/graphichelper.hxx
index 1d9e9e3..650a300 100644
--- a/svx/inc/svx/graphichelper.hxx
+++ b/svx/inc/svx/graphichelper.hxx
@@ -25,16 +25,13 @@
#include <com/sun/star/drawing/XShape.hpp>
-using namespace css::uno;
-using namespace css::drawing;
-
class SVX_DLLPUBLIC GraphicHelper
{
public:
static void GetPreferedExtension( OUString& rExtension, const Graphic& rGraphic );
static OUString ExportGraphic( const Graphic& rGraphic, const OUString& rGraphicName );
- static void SaveShapeAsGraphic( const Reference< XShape >& xShape );
+ static void SaveShapeAsGraphic( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
};
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 4671c91..deb3397 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -56,6 +56,8 @@ using namespace css::ui::dialogs;
using namespace sfx2;
+namespace drawing = com::sun::star::drawing;
+
void GraphicHelper::GetPreferedExtension( OUString& rExtension, const Graphic& rGraphic )
{
OUString aExtension = "png";
@@ -196,7 +198,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
return OUString();
}
-void GraphicHelper::SaveShapeAsGraphic( const Reference< XShape >& xShape )
+void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xShape )
{
try
{
More information about the Libreoffice-commits
mailing list