[Libreoffice-commits] core.git: 3 commits - basctl/source cui/source extras/source filter/source fpicker/test include/comphelper include/vcl mysqlc/source sd/inc sd/source svtools/source sw/source vcl/aqua vcl/inc vcl/source xmlhelp/source xmloff/source xmlsecurity/inc
Thomas Arnhold
thomas at arnhold.org
Tue Oct 15 21:22:04 PDT 2013
basctl/source/basicide/bastype3.hxx | 6 ----
cui/source/dialogs/hlinettp.cxx | 3 +-
extras/source/palettes/standard.soc | 2 -
filter/source/graphicfilter/eos2met/eos2met.cxx | 2 -
fpicker/test/svdem.cxx | 2 -
include/comphelper/ihwrapnofilter.hxx | 10 ------
include/vcl/svapp.hxx | 3 --
mysqlc/source/mysqlc_propertyids.hxx | 4 --
sd/inc/sdpage.hxx | 2 -
sd/source/filter/eppt/epptso.cxx | 2 -
sd/source/ui/inc/PresentationViewShell.hxx | 2 -
sd/source/ui/view/OutlinerIterator.cxx | 2 -
sd/source/ui/view/drawview.cxx | 2 -
sd/source/ui/view/drviews3.cxx | 2 -
sd/source/ui/view/drviewsa.cxx | 4 --
sd/source/ui/view/drviewsf.cxx | 2 -
sd/source/ui/view/drviewsg.cxx | 3 --
sd/source/ui/view/drviewsh.cxx | 2 -
sd/source/ui/view/presvish.cxx | 2 -
sd/source/ui/view/unmodpg.cxx | 4 --
svtools/source/config/test/test.cxx | 2 -
sw/source/filter/html/htmlsect.cxx | 2 -
vcl/aqua/source/gdi/salgdicommon.cxx | 4 --
vcl/inc/xconnection.hxx | 2 -
vcl/source/gdi/bmpfast.cxx | 24 ----------------
xmlhelp/source/cxxhelp/test/abidebug.hxx | 3 --
xmloff/source/transform/EventOASISTContext.cxx | 6 ----
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 3 --
xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx | 3 --
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 4 --
30 files changed, 4 insertions(+), 110 deletions(-)
New commits:
commit e7841b62456fcb5743f4ab60a4e967883260c7db
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Oct 16 06:17:09 2013 +0200
fdo#45777: handling of whitespaces in hyperlinks
Remove leading and trailing whitespaces in the hyperlink dialog, because
the resulting links would be unusable.
Change-Id: Icf617daf51508a37494536e02fb298fb3cf746c5
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 6809ed6..47c6e0d 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -181,7 +181,8 @@ void SvxHyperlinkInternetTp::GetCurentItemData ( OUString& rStrURL, OUString& aS
OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
{
- OUString aStrURL(maCbbTarget.GetText());
+ // erase leading and trailing whitespaces
+ OUString aStrURL( maCbbTarget.GetText().trim() );
INetURLObject aURL(aStrURL);
commit aa2d011acdcf332693f2a32a8eb3b9d73c958be7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Oct 16 05:41:55 2013 +0200
fdo#45970: "pale green" is not green at all
Was like Cyan 10 before. Now it's like Green 10...
Change-Id: I7ec9b884b53fb0ab2a5a0c3d09cb8b2789037234
diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
index 40d559a4..36ad9da 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -177,7 +177,7 @@
<draw:color draw:name="Violet" draw:color="#9999ff"/>
<draw:color draw:name="Bordeaux" draw:color="#993366"/>
<draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
- <draw:color draw:name="Pale green" draw:color="#ccffff"/>
+ <draw:color draw:name="Pale green" draw:color="#ccffcc"/>
<draw:color draw:name="Dark violet" draw:color="#660066"/>
<draw:color draw:name="Salmon" draw:color="#ff8080"/>
<draw:color draw:name="Sea blue" draw:color="#0066cc"/>
commit 67aec439153b8a374d418cfe653b601f8d1b514a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Oct 16 04:12:49 2013 +0200
cleanup
Change-Id: I7bfd221f89718ba8634417c93a26b3a199178694
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 5d51783..ca2da15 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -20,13 +20,9 @@
#define BASCTL_BASTYPE3_HXX
#include <svheader.hxx>
-
#include <svtools/svmedit.hxx>
-
#include <iderid.hxx>
-#ifndef NO_SPECIALEDIT
-
namespace basctl
{
@@ -54,8 +50,6 @@ public:
} // namespace basctl
-#endif // NO_SPECIALEDIT
-
#endif // BASCTL_BASTYPE3_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 76ec162..e48c370 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -238,9 +238,7 @@ public:
METWriter() :
pMET(NULL), pGDIStack(NULL), nMETStrokeLineWidth(0), nMETChrAngle(0), pChrSetList(NULL), pCompDev(NULL)
{
-#ifndef NO_GETAPPWINDOW
pCompDev = reinterpret_cast< OutputDevice* >( Application::GetAppWindow() );
-#endif
if( !pCompDev )
{
apDummyVDev.reset( new VirtualDevice );
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 19723a1..aa65386 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -23,9 +23,7 @@
#include <cppuhelper/servicefactory.hxx>
-#ifndef _RTL_USTRING_
#include <rtl/ustring>
-#endif
#include <sal/types.h>
#include <osl/diagnose.h>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx
index eb0b139..0af98b9 100644
--- a/include/comphelper/ihwrapnofilter.hxx
+++ b/include/comphelper/ihwrapnofilter.hxx
@@ -21,21 +21,11 @@
#define _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_
#include <com/sun/star/task/XInteractionHandler2.hpp>
-#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_
#include <com/sun/star/task/XInteractionHandler.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TASK_XINTERACITONREQUEST_
#include <com/sun/star/task/XInteractionRequest.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_
#include <com/sun/star/lang/XInitialization.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_DOUBLEINITIALIZATIONEXCEPTION_
#include <com/sun/star/frame/DoubleInitializationException.hpp>
-#endif
#include <cppuhelper/implbase2.hxx>
#include "comphelper/comphelperdllapi.h"
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index ba2cf9e..07baee7 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -242,10 +242,7 @@ public:
virtual void AppEvent( const ApplicationEvent& rAppEvent );
-#ifndef NO_GETAPPWINDOW
static WorkWindow* GetAppWindow();
-#endif
-
static Window* GetFocusWindow();
static OutputDevice* GetDefaultDevice();
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index f77d972..8b010a6 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -22,12 +22,8 @@
// this define has to be set to split the names into different dll's or so's
// every dll has his own set of property names
-#ifndef _RTL_USTRING_
#include <rtl/ustring.hxx>
-#endif
-#ifndef _MAP_
#include <map>
-#endif
namespace connectivity
{
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 0cc72cf..5ec9de3 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -33,9 +33,7 @@
#include <svx/fmpage.hxx>
#include "fadedef.h"
#include "diadef.h"
-#ifndef _PRESENTATION
#include "pres.hxx"
-#endif
#include "shapelist.hxx"
#include "misc/scopelock.hxx"
#include "sddllapi.h"
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index c518453..97823aa 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -44,9 +44,7 @@
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/LineSpacingMode.hpp>
-#ifndef _COM_SUN_STAR_STYLE_XSTYLEFAMILIESSUPPLIER_PP_
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#endif
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/drawing/PointSequence.hpp>
#include <com/sun/star/drawing/FlagSequence.hpp>
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index 49d9a74..0a10c5e 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -20,9 +20,7 @@
#ifndef SD_PRESENTATION_VIEW_SHELL_HXX
#define SD_PRESENTATION_VIEW_SHELL_HXX
-#ifndef SD_DRAW_VIEW_SHELL
#include "DrawViewShell.hxx"
-#endif
namespace sd {
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index b1b39aa..8ac476b 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -29,9 +29,7 @@
#include "DrawViewShell.hxx"
#include "drawview.hxx"
#include "sdpage.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "DrawDocShell.hxx"
#include "Window.hxx"
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 2ee5aa8..18c7a08 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -57,9 +57,7 @@
#include "sdresid.hxx"
#include "Window.hxx"
#include "unchss.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "anminfo.hxx"
#include "slideshow.hxx"
#include <vcl/virdev.hxx>
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 3607995..31e89a4 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -61,9 +61,7 @@
#include "sdmod.hxx"
#include "fupoor.hxx"
#include "slideshow.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "sdpage.hxx"
#include "Window.hxx"
#include "sdresid.hxx"
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 18dd7d1..a836a22 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -22,13 +22,9 @@
#include <com/sun/star/scanner/ScannerManager.hpp>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/processfactory.hxx>
-#ifndef _SVX_SIZEITEM
#include <editeng/sizeitem.hxx>
-#endif
#include <svx/svdlayer.hxx>
-#ifndef _SVX_ZOOMITEM
#include <sfx2/zoomitem.hxx>
-#endif
#include <svx/svdpagv.hxx>
#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 35ef900..6ed5dbc 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -42,9 +42,7 @@
#include <svx/fmshell.hxx>
#include <svl/cjkoptions.hxx>
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "Outliner.hxx"
#include "app.hrc"
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 3de6c84..9d93955 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -37,11 +37,8 @@
#include "imapinfo.hxx"
#include "sdmod.hxx"
#include "optsitem.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "drawview.hxx"
-
#include "fupoor.hxx"
namespace sd {
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index 16c89f7..7608c00 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -31,9 +31,7 @@
#include "app.hrc"
#include "strings.hrc"
#include "sdpage.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "sdresid.hxx"
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index a2a467c..1bc08e0 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -33,9 +33,7 @@
#include <sfx2/objface.hxx>
#include <svx/svxids.hrc>
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "sdresid.hxx"
#include "DrawDocShell.hxx"
#include "slideshow.hxx"
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 580c71c..13df396 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -17,14 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef _SVDLAYER
#include <svx/svdlayer.hxx>
-#endif
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-
#include "strings.hrc"
#include "glob.hxx"
#include "glob.hrc" // STR_BCKGRND, STR_BCKGRNDOBJ
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index fa676c6..f66c42d 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -37,9 +37,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
-#ifndef _RTL_USTRING_
#include <rtl/ustring>
-#endif
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 07a8b68..77c764d 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -704,9 +704,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
}
SwFmtCol aFmtCol;
-#ifndef WIDTH_SUPPORTED_BY_SECTIONS
nPrcWidth = 100;
-#endif
aFmtCol.Init( nCols, nGutter, nPrcWidth ? USHRT_MAX : nTwipWidth );
aFrmItemSet.Put( aFmtCol );
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index 45be91e..d9c54d9 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -813,10 +813,8 @@ bool AquaSalGraphics::drawPolyLine(
AddPolygonToPath( xPath, rPolyLine, rPolyLine.isClosed(), !getAntiAliasB2DDraw(), true );
const CGRect aRefreshRect = CGPathGetBoundingBox( xPath );
-#ifndef NO_I97317_WORKAROUND
// #i97317# workaround for Quartz having problems with drawing small polygons
if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <= 0.125)) )
-#endif
{
// use the path to prepare the graphics context
CGContextSaveGState( mrContext );
@@ -867,10 +865,8 @@ bool AquaSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPol
}
const CGRect aRefreshRect = CGPathGetBoundingBox( xPath );
-#ifndef NO_I97317_WORKAROUND
// #i97317# workaround for Quartz having problems with drawing small polygons
if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <= 0.125)) )
-#endif
{
// use the path to prepare the graphics context
CGContextSaveGState( mrContext );
diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx
index f7a8e00..88feafe 100644
--- a/vcl/inc/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
@@ -26,9 +26,7 @@
#include "vcl/displayconnectiondispatch.hxx"
-#ifndef _STLP_LIST
#include <list>
-#endif
namespace vcl {
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 2cabddf..0fe79ea 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -19,9 +19,6 @@
#include <bmpfast.hxx>
-
-#ifndef NO_OPTIMIZED_BITMAP_ACCESS
-
#include <tools/debug.hxx>
#include <vcl/bmpacc.hxx>
@@ -908,25 +905,4 @@ bool ImplFastEraseBitmap( BitmapBuffer& rDst, const BitmapColor& rColor )
return false;
}
-#else // NO_OPTIMIZED_BITMAP_ACCESS
-
-bool ImplFastBitmapConversion( BitmapBuffer&, const BitmapBuffer& )
-{
- return false;
-}
-
-bool ImplFastBitmapBlending( BitmapWriteAccess&,
- const BitmapReadAccess&, const BitmapReadAccess&,
- const Size&, const Point& )
-{
- return false;
-}
-
-bool ImplFastEraseBitmap( BitmapBuffer&, const BitmapColor& )
-{
- return false;
-}
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/test/abidebug.hxx b/xmlhelp/source/cxxhelp/test/abidebug.hxx
index b1cfbf7..bb16c68 100644
--- a/xmlhelp/source/cxxhelp/test/abidebug.hxx
+++ b/xmlhelp/source/cxxhelp/test/abidebug.hxx
@@ -17,9 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <iostream>
-#ifndef _RTL_USTRING_
#include <rtl/ustring>
-#endif
+
ostream& operator<<( ostream& out,const OUString& bla );
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index b43ad1c..dd6bd57 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -26,12 +26,10 @@
#include "TransformerActions.hxx"
#include "TransformerBase.hxx"
-#ifndef OASIS_FILTER_OOO_1X
// Used to parse Scripting Framework URLs
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
#include <comphelper/processfactory.hxx>
-#endif
#include <boost/unordered_map.hpp>
@@ -181,9 +179,6 @@ bool ParseURL(
const OUString& rAttrValue,
OUString* pName, OUString* pLocation )
{
-#ifdef OASIS_FILTER_OOO_1X
- return ParseURLAsString( rAttrValue, pName, pLocation );
-#else
Reference< com::sun::star::uno::XComponentContext >
xContext = ::comphelper::getProcessComponentContext();
@@ -222,7 +217,6 @@ bool ParseURL(
}
}
return sal_False;
-#endif
}
void XMLEventOASISTransformerContext::StartElement(
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index d8423fc..a4c1193 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -30,10 +30,7 @@
#include <xmlsecurity/documentsignaturehelper.hxx>
#include <xmlsecurity/xmlsignaturehelper.hxx>
-
-#ifndef _STLP_VECTOR
#include <vector>
-#endif
namespace com {
namespace sun {
diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
index 35315c8..361c8d3 100644
--- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
@@ -24,10 +24,7 @@
#include <rtl/ustring.hxx>
#include "xmlsecurity/sigstruct.hxx"
-#ifndef _STLP_VECTOR
#include <vector>
-#endif
-
namespace com {
namespace sun {
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index b9e85e7..cf2dc7c 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -20,14 +20,10 @@
#ifndef _XMLSECURITY_XMLSIGNATUREHELPER_HXX
#define _XMLSECURITY_XMLSIGNATUREHELPER_HXX
-#ifndef _STLP_VECTOR
#include <vector>
-#endif
#include <tools/link.hxx>
-
#include <rtl/ustring.hxx>
-
#include <xmlsecurity/sigstruct.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
More information about the Libreoffice-commits
mailing list