don't need an extra header, fold into body

2 files changed, 29 insertions, 63 deletions

diff --git a/accessibility/inc/accessibility/helper/acc_factory.hxx b/accessibility/inc/accessibility/helper/acc_factory.hxx
deleted file mode 100644
index b3dec4607517..000000000000
--- a/accessibility/inc/accessibility/helper/acc_factory.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef ACCESSIBILITY_HELPER_FACTORY_HXX
-#define ACCESSIBILITY_HELPER_FACTORY_HXX
-
-#include <toolkit/helper/accessiblefactory.hxx>
-#include <svtools/accessiblefactory.hxx>
-
-/** this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
-    by this library
-
-    This function implements the factory function needed in toolkit
-    (of type GetStandardAccComponentFactory).
-*/
-extern "C" void* SAL_CALL getStandardAccessibleFactory();
-
-/** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied
-    by this library
-
-    This function implements the factory function needed in svtools
-    (of type GetSvtAccessibilityComponentFactory).
-*/
-extern "C" void* SAL_CALL getSvtAccessibilityComponentFactory();
-
-#endif // ACCESSIBILITY_HELPER_FACTORY_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 1bbe20c9cc63..92ce2cc43d19 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include <accessibility/helper/acc_factory.hxx>
-
 #include <toolkit/awt/vclxwindows.hxx>
+#include <toolkit/helper/accessiblefactory.hxx>
+#include <svtools/accessiblefactory.hxx>
 #include <accessibility/standard/vclxaccessiblebutton.hxx>
 #include <accessibility/standard/vclxaccessiblecheckbox.hxx>
 #include <accessibility/standard/vclxaccessibledropdowncombobox.hxx>
@@ -536,18 +536,37 @@ inline bool hasFloatingChild(Window *pWindow)
 //........................................................................
 
 //========================================================================
-extern "C" void* SAL_CALL getStandardAccessibleFactory()
+
+/** this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
+    by this library
+
+    This function implements the factory function needed in toolkit
+    (of type GetStandardAccComponentFactory).
+*/
+extern "C"
 {
-    ::toolkit::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
-    pFactory->acquire();
-    return pFactory;
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL getStandardAccessibleFactory()
+    {
+        ::toolkit::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
+        pFactory->acquire();
+        return pFactory;
+    }
 }
 
-extern "C" void* SAL_CALL getSvtAccessibilityComponentFactory()
+/** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied
+    by this library
+
+    This function implements the factory function needed in svtools
+    (of type GetSvtAccessibilityComponentFactory).
+*/
+extern "C"
 {
-    ::svt::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
-    pFactory->acquire();
-    return pFactory;
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL getSvtAccessibilityComponentFactory()
+    {
+        ::svt::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
+        pFactory->acquire();
+        return pFactory;
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */