[Libreoffice-commits] core.git: framework/source sw/source

Caolán McNamara caolanm at redhat.com
Tue Jun 14 11:26:34 UTC 2016


 framework/source/interaction/quietinteraction.cxx |    2 --
 sw/source/uibase/dochdl/gloshdl.cxx               |    2 --
 sw/source/uibase/misc/glosdoc.cxx                 |    2 --
 3 files changed, 6 deletions(-)

New commits:
commit c44d5589dfc4312ab98408dec68c8577240dd7d3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 14 11:34:14 2016 +0100

    the __RSC hack is only needed in src files and things included from src files
    
    Change-Id: I50c122426030ba5b508dcd6ac33464ecab154981

diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index eed293f..e25aa30 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -30,9 +30,7 @@
 
 #include <vcl/svapp.hxx>
 
-#ifndef __RSC
 #include <tools/errinf.hxx>
-#endif
 
 namespace framework{
 
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 69e49e4..2735790 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -20,9 +20,7 @@
 #include <hintids.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/adjustitem.hxx>
-#ifndef __RSC //autogen
 #include <tools/errinf.hxx>
-#endif
 #include <vcl/msgbox.hxx>
 #include <svl/macitem.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 44426548..0e054e5 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -23,9 +23,7 @@
 
 #include <unotools/transliterationwrapper.hxx>
 
-#ifndef __RSC //autogen
 #include <tools/errinf.hxx>
-#endif
 #include <osl/diagnose.h>
 #include <svl/urihelper.hxx>
 #include <svl/fstathelper.hxx>


More information about the Libreoffice-commits mailing list