[Libreoffice-commits] .: basic/source svx/inc svx/source ucb/source xmloff/source

[Joseph Powers]

 basic/source/inc/sbunoobj.hxx                            |    1 +
 svx/inc/svx/sdasitm.hxx                                  |    2 +-
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |    7 ++++---
 ucb/source/ucp/file/filtask.hxx                          |   13 ++-----------
 xmloff/source/draw/EnhancedCustomShapeToken.cxx          |    7 ++++---
 5 files changed, 12 insertions(+), 18 deletions(-)

New commits:
commit 06db1bcc4e3e29fcca77e475f92a30f8133720ed
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Feb 5 16:19:49 2011 -0800

    Cleanup of boost conversion issues

diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 19450be..02f9cb9 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/reflection/XSingletonTypeDescription.hpp>
 #include <rtl/ustring.hxx>
 #include <boost/unordered_map.hpp>
+#include <vector>
 
 class SbUnoObject: public SbxObject
 {
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index fcca03f..8dde3c8 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 54663e2..a1218df 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,6 +31,7 @@
 #include "EnhancedCustomShapeTypeNames.hxx"
 #include <osl/mutex.hxx>
 #include <boost/unordered_map.hpp>
+#include <hash_map>
 
 struct TCheck
 {
@@ -52,7 +53,7 @@ struct NameTypeTable
     const char*	pS;
     MSO_SPT		pE;
 };
-static const NameTypeTable pNameTypeTableArray[] = 
+static const NameTypeTable pNameTypeTableArray[] =
 {
     { "non-primitive", mso_sptMin },
     { "rectangle", mso_sptRectangle },
@@ -259,7 +260,7 @@ static const NameTypeTable pNameTypeTableArray[] =
     { "mso-spt202", mso_sptTextBox }
 };
 
-    // gallery: quadrat		
+    // gallery: quadrat
     // gallery: round-quadrat
     // gallery: circle
     // gallery: circle-pie
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 90dec95..d40cfc1 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include "filerror.hxx"
-
+#include <hash_map>
 
 namespace fileaccess
 {
@@ -184,15 +184,6 @@ namespace fileaccess
                                     sal_Int32 ErrorCode,
                                     sal_Int32 minorCode = TASKHANDLER_NO_ERROR );
 
-
-//          void SAL_CALL installError( sal_Int32 CommandId,
-//                                      sal_Int32 ErrorCode,
-//                                      rtl::OUString message );
-
-//          void SAL_CALL installError( sal_Int32 CommandId,
-//                                      sal_Int32 ErrorCode,
-//                                      rtl::OUString message );
-
         void SAL_CALL retrieveError( sal_Int32 CommandId,
                                      sal_Int32 &ErrorCode,
                                      sal_Int32 &minorCode);
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 7264757..a830dab 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,6 +31,7 @@
 #include "EnhancedCustomShapeToken.hxx"
 #include <osl/mutex.hxx>
 #include <boost/unordered_map.hpp>
+#include <hash_map>
 #include <string.h>
 
 namespace xmloff { namespace EnhancedCustomShapeToken {
@@ -56,7 +57,7 @@ struct TokenTable
     EnhancedCustomShapeTokenEnum		pE;
 };
 
-static const TokenTable pTokenTableArray[] = 
+static const TokenTable pTokenTableArray[] =
 {
     { "type",								EAS_type },
     { "name",								EAS_name },
@@ -178,7 +179,7 @@ static const TokenTable pTokenTableArray[] =
     { "Position",							EAS_Position },
     { "AdjustmentValues",					EAS_AdjustmentValues },
 
-    { "Last",								EAS_Last }, 
+    { "Last",								EAS_Last },
     { "NotFound",							EAS_NotFound }
 };