1 files changed, 9 insertions, 15 deletions
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index 19ce354c9735..26f395fa1b06 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -16,12 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CHART2_SOURCE_INC_PROPERTYHELPER_HXX
-#define INCLUDED_CHART2_SOURCE_INC_PROPERTYHELPER_HXX
+#pragma once
 
+#include <config_options.h>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include "charttoolsdllapi.hxx"
 
 #include <unordered_map>
 
@@ -42,7 +41,7 @@ namespace PropertyHelper
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable(
+OUString addLineDashUniqueNameToTable(
     const css::uno::Any & rValue,
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
@@ -52,7 +51,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable(
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable(
+OUString addGradientUniqueNameToTable(
     const css::uno::Any & rValue,
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
@@ -62,7 +61,6 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable(
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS
 OUString addTransparencyGradientUniqueNameToTable(
     const css::uno::Any & rValue,
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
@@ -73,7 +71,7 @@ OUString addTransparencyGradientUniqueNameToTable(
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable(
+OUString addHatchUniqueNameToTable(
     const css::uno::Any & rValue,
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
@@ -83,7 +81,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable(
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable(
+OUString addBitmapUniqueNameToTable(
     const css::uno::Any & rValue,
     const css::uno::Reference< css::lang::XMultiServiceFactory > & xFact,
     const OUString & rPreferredName );
@@ -93,7 +91,6 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable(
 
     @param any is the value encapsulated in the variant type Any
  */
-OOO_DLLPUBLIC_CHARTTOOLS
 void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key,
                           const css::uno::Any & rAny );
 
@@ -112,7 +109,7 @@ template< typename Value >
 template<>
     void setPropertyValue< css::uno::Any >( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny );
 
-OOO_DLLPUBLIC_CHARTTOOLS void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny );
+void setPropertyValueDefaultAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const css::uno::Any & rAny );
 
 /** Calls setPropertyValue() but asserts that the given property hasn't been set
     before.
@@ -131,11 +128,11 @@ template<>
 
 /** Calls setPropertyValueDefault() with an empty Any as value
  */
-OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key );
+void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key );
 
 } // namespace PropertyHelper
 
-struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess
+struct PropertyNameLess
 {
     bool operator() ( const css::beans::Property & first,
                              const css::beans::Property & second )
@@ -146,7 +143,4 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess
 
 } //  namespace chart
 
-// INCLUDED_CHART2_SOURCE_INC_PROPERTYHELPER_HXX
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */