diff options
375 files changed, 1240 insertions, 1240 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 927b77aebb0c..0b1d2fe3e4d2 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -18,10 +18,10 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOX_HXX -#include <accessibility/extended/AccessibleBrowseBoxBase.hxx> +#include <extended/AccessibleBrowseBoxBase.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <svtools/accessibletableprovider.hxx> diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index fe2035f5cc4d..de94fa7b3d5a 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -18,8 +18,8 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXBASE_HXX #include <sal/config.h> diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 91a4c13dacdb..2533ded30224 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -16,13 +16,13 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include "accessibility/extended/accessiblebrowseboxcell.hxx" +#include "extended/accessiblebrowseboxcell.hxx" #include <cppuhelper/implbase2.hxx> #include <tools/wintypes.hxx> @@ -79,6 +79,6 @@ namespace accessibility void SetChecked( bool _bChecked ); }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index 72011d8daf96..d9ea755396f8 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -18,10 +18,10 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX -#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx" +#include "extended/AccessibleBrowseBoxTableBase.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index 0f9f1bacbf92..b616529c0b65 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -16,10 +16,10 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX -#include "accessibility/extended/AccessibleBrowseBoxBase.hxx" +#include "extended/AccessibleBrowseBoxBase.hxx" namespace accessibility { @@ -69,6 +69,6 @@ namespace accessibility }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXHEADERCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx index 2bd31e1bff46..5cbe7df5e703 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx @@ -18,10 +18,10 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLE_HXX -#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx" +#include "extended/AccessibleBrowseBoxTableBase.hxx" namespace accessibility { diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index 1baa85f5d661..9ea46eb27fa8 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -18,10 +18,10 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX -#include "accessibility/extended/AccessibleBrowseBoxBase.hxx" +#include "extended/AccessibleBrowseBoxBase.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 6c10d4e8a3c5..0fb9388ed61c 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -16,10 +16,10 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX -#include "accessibility/extended/accessiblebrowseboxcell.hxx" +#include "extended/accessiblebrowseboxcell.hxx" #include <comphelper/accessibletexthelper.hxx> #include <cppuhelper/implbase2.hxx> @@ -128,6 +128,6 @@ namespace accessibility virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 865f8258f98c..a2f19e5de343 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROL_HXX -#include <accessibility/extended/AccessibleGridControlBase.hxx> -#include <accessibility/extended/AccessibleGridControlTable.hxx> +#include <extended/AccessibleGridControlBase.hxx> +#include <extended/AccessibleGridControlTable.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <svtools/accessibletable.hxx> diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index b5ba1bd65e3e..978baf95675a 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -18,8 +18,8 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX #include <svtools/accessibletable.hxx> #include <rtl/ustring.hxx> diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index 5f4039f4e5bc..882f87a95401 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -18,11 +18,11 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADER_HXX -#include <accessibility/extended/AccessibleGridControlHeaderCell.hxx> -#include <accessibility/extended/AccessibleGridControlTableBase.hxx> +#include <extended/AccessibleGridControlHeaderCell.hxx> +#include <extended/AccessibleGridControlTableBase.hxx> namespace accessibility { diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index ad1449de1b06..82272a000ad4 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -16,10 +16,10 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX -#include "accessibility/extended/AccessibleGridControlTableCell.hxx" +#include "extended/AccessibleGridControlTableCell.hxx" namespace accessibility { @@ -81,6 +81,6 @@ namespace accessibility }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index 22c71db21f52..e784544764ad 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -18,13 +18,13 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX -#include "accessibility/extended/AccessibleGridControlTableBase.hxx" +#include "extended/AccessibleGridControlTableBase.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <accessibility/extended/AccessibleGridControlTableCell.hxx> +#include <extended/AccessibleGridControlTableCell.hxx> namespace accessibility { diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index e2311aaa77b6..e818cdd9db5a 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -18,10 +18,10 @@ */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX -#include "accessibility/extended/AccessibleGridControlBase.hxx" +#include "extended/AccessibleGridControlBase.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index f03df43d2265..489f695635f8 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -16,12 +16,12 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX #include <comphelper/accessibletexthelper.hxx> #include <cppuhelper/implbase2.hxx> -#include "accessibility/extended/AccessibleGridControlBase.hxx" +#include "extended/AccessibleGridControlBase.hxx" #include <svtools/accessibletable.hxx> namespace accessibility @@ -149,6 +149,6 @@ namespace accessibility virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx index bafb0590da5c..e39739e10cc6 100644 --- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX -#include "accessibility/extended/AccessibleBrowseBoxBase.hxx" +#include "extended/AccessibleBrowseBoxBase.hxx" #include <svtools/AccessibleBrowseBoxObjType.hxx> @@ -72,6 +72,6 @@ namespace accessibility } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index 8ec563a65e8b..24e98b720d6d 100644 --- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -16,8 +16,8 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX #include "accessiblebrowseboxcell.hxx" #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -137,6 +137,6 @@ namespace accessibility }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEEDITBROWSEBOXCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index 0bcaea64a6b8..837ee7f7d033 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -105,6 +105,6 @@ namespace accessibility }// namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index 180aedf06090..f1fea9fcae48 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX #include <deque> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -186,6 +186,6 @@ namespace accessibility }// namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEICONCHOICECTRLENTRY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index a6e0c5cae09c..fbdc250493f5 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOX_HXX #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -128,6 +128,6 @@ private: }// namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 3ce874162b92..bfcbbfc0df19 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX #include <deque> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -37,7 +37,7 @@ #include <comphelper/accessibletexthelper.hxx> #include <svtools/treelistentry.hxx> #include <tools/gen.hxx> -#include "accessibility/extended/listboxaccessible.hxx" +#include "extended/listboxaccessible.hxx" // forward --------------------------------------------------------------- @@ -225,6 +225,6 @@ namespace accessibility }// namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLELISTBOXENTRY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index 60c8d52a78f7..b248839f78e4 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBAR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBAR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBAR_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBAR_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> -#include "accessibility/extended/accessibletabbarbase.hxx" +#include "extended/accessibletabbarbase.hxx" #include <vector> @@ -107,6 +107,6 @@ namespace accessibility } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBAR_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx index 40fadf73d497..2c2d738cbc9b 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/extended/accessibletabbarbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARBASE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARBASE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARBASE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARBASE_HXX #include <comphelper/accessiblecomponenthelper.hxx> #include <tools/link.hxx> diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index 8904a14bd7b0..795aebca002e 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGE_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> -#include "accessibility/extended/accessibletabbarbase.hxx" +#include "extended/accessibletabbarbase.hxx" #include <vector> @@ -123,6 +123,6 @@ namespace accessibility } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGE_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx index a9d7556ba105..e46d73f6bb0c 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase3.hxx> -#include "accessibility/extended/accessibletabbarbase.hxx" +#include "extended/accessibletabbarbase.hxx" #include <vector> @@ -127,6 +127,6 @@ namespace accessibility } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABBARPAGELIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx index bfc9e2a2c80e..b17209933252 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx +++ b/accessibility/inc/extended/accessibletablistbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOX_HXX #include "AccessibleBrowseBox.hxx" #include <cppuhelper/implbase1.hxx> @@ -99,6 +99,6 @@ protected: } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx index 4c79a9962871..feb9aad59635 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/extended/accessibletablistboxtable.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX #include "AccessibleBrowseBoxTable.hxx" #include <comphelper/uno3.hxx> @@ -104,6 +104,6 @@ public: } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx index ed6e0a29d783..ef673d93f4fe 100644 --- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx +++ b/accessibility/inc/extended/listboxaccessible.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_LISTBOXACCESSIBLE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_LISTBOXACCESSIBLE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_LISTBOXACCESSIBLE_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_LISTBOXACCESSIBLE_HXX #include <com/sun/star/uno/RuntimeException.hpp> #include <tools/link.hxx> @@ -79,6 +79,6 @@ namespace accessibility } // namespace accessibility -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_LISTBOXACCESSIBLE_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_LISTBOXACCESSIBLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 6d101612f54f..70fa94f2cb88 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX +#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <svl/lstner.hxx> @@ -688,6 +688,6 @@ private: } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_TEXTWINDOWACCESSIBILITY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index 7777e920b72a..8d528be793db 100644 --- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -16,8 +16,8 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ICOMBOLISTBOXHELPER_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ICOMBOLISTBOXHELPER_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_ICOMBOLISTBOXHELPER_HXX +#define INCLUDED_ACCESSIBILITY_INC_HELPER_ICOMBOLISTBOXHELPER_HXX #include <com/sun/star/uno/Reference.hxx> @@ -63,7 +63,7 @@ namespace accessibility GetClipboard() = 0; }; } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ICOMBOLISTBOXHELPER_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_ICOMBOLISTBOXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc index 60c4392a7562..60c4392a7562 100644 --- a/accessibility/inc/accessibility/helper/accessiblestrings.hrc +++ b/accessibility/inc/helper/accessiblestrings.hrc diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx index fe8ae624843e..38ceaa172abd 100644 --- a/accessibility/inc/accessibility/helper/accresmgr.hxx +++ b/accessibility/inc/helper/accresmgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ACCRESMGR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ACCRESMGR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX +#define INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX #include <rtl/ustring.hxx> @@ -61,6 +61,6 @@ public: } -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_ACCRESMGR_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx index 3ed820b127e4..6b679a9d5b6a 100644 --- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx +++ b/accessibility/inc/helper/characterattributeshelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_CHARACTERATTRIBUTESHELPER_HXX +#define INCLUDED_ACCESSIBILITY_INC_HELPER_CHARACTERATTRIBUTESHELPER_HXX #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,6 +47,6 @@ public: css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ); }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_CHARACTERATTRIBUTESHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index 1dec33d21134..9236d32a7b13 100644 --- a/accessibility/inc/accessibility/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_HELPER_LISTBOXHELPER_HXX +#define INCLUDED_ACCESSIBILITY_INC_HELPER_LISTBOXHELPER_HXX -#include <accessibility/helper/IComboListBoxHelper.hxx> +#include <helper/IComboListBoxHelper.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> @@ -184,6 +184,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_LISTBOXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index c0ab3af65eb0..f0c4ba2f934a 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -337,21 +337,21 @@ #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> #include <unotools/unotoolsdllapi.h> -#include <accessibility/extended/AccessibleBrowseBox.hxx> -#include <accessibility/extended/AccessibleBrowseBoxBase.hxx> -#include <accessibility/extended/AccessibleBrowseBoxTableBase.hxx> -#include <accessibility/extended/AccessibleGridControl.hxx> -#include <accessibility/extended/AccessibleGridControlBase.hxx> -#include <accessibility/extended/AccessibleGridControlTableCell.hxx> -#include <accessibility/extended/accessibletabbarbase.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/characterattributeshelper.hxx> -#include <accessibility/helper/listboxhelper.hxx> -#include <accessibility/standard/accessiblemenubasecomponent.hxx> -#include <accessibility/standard/accessiblemenuitemcomponent.hxx> -#include <accessibility/standard/vclxaccessiblebox.hxx> -#include <accessibility/standard/vclxaccessibleedit.hxx> -#include <accessibility/standard/vclxaccessiblelist.hxx> -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <extended/AccessibleBrowseBox.hxx> +#include <extended/AccessibleBrowseBoxBase.hxx> +#include <extended/AccessibleBrowseBoxTableBase.hxx> +#include <extended/AccessibleGridControl.hxx> +#include <extended/AccessibleGridControlBase.hxx> +#include <extended/AccessibleGridControlTableCell.hxx> +#include <extended/accessibletabbarbase.hxx> +#include <helper/accresmgr.hxx> +#include <helper/characterattributeshelper.hxx> +#include <helper/listboxhelper.hxx> +#include <standard/accessiblemenubasecomponent.hxx> +#include <standard/accessiblemenuitemcomponent.hxx> +#include <standard/vclxaccessiblebox.hxx> +#include <standard/vclxaccessibleedit.hxx> +#include <standard/vclxaccessiblelist.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 11cbf87ddb85..167c957c5aca 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -140,6 +140,6 @@ public: virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx index 859756041438..eb570e07a827 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/standard/accessiblemenucomponent.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX -#include <accessibility/standard/accessiblemenubasecomponent.hxx> +#include <standard/accessiblemenubasecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase1.hxx> @@ -84,6 +84,6 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx index 2bcf01f60882..84d0cc22e309 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX -#include <accessibility/standard/accessiblemenubasecomponent.hxx> +#include <standard/accessiblemenubasecomponent.hxx> // class OAccessibleMenuItemComponent @@ -85,6 +85,6 @@ public: virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 7fec38d57559..1943f1e2ce21 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBOX_HXX #include <map> -#include <accessibility/standard/vclxaccessibleedit.hxx> +#include <standard/vclxaccessibleedit.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx index 8f0a8f1fa42b..e5f4a1280cf7 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> @@ -73,6 +73,6 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx index db0f699e98b7..ca406a2480f4 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> @@ -80,6 +80,6 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index 082bd30d0990..4fd6bf829055 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX #include <map> -#include <accessibility/standard/vclxaccessiblebox.hxx> +#include <standard/vclxaccessiblebox.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -52,6 +52,6 @@ protected: virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index ab6d71bed276..e6ae12834aa6 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX -#include <accessibility/standard/vclxaccessiblebox.hxx> -#include <accessibility/standard/vclxaccessibleedit.hxx> +#include <standard/vclxaccessiblebox.hxx> +#include <standard/vclxaccessibleedit.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> /** The accessible drop down combobox has two children. The first is the @@ -51,6 +51,6 @@ protected: virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx index 23f1ab4ba9b0..f18945d3bdc3 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX -#include <accessibility/standard/vclxaccessiblebox.hxx> +#include <standard/vclxaccessiblebox.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> /** The accessible drop down combobox has two children. The first is the @@ -51,6 +51,6 @@ protected: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index 7e395620a410..429588f1bb78 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> #include <com/sun/star/accessibility/XAccessibleEditableText.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -106,6 +106,6 @@ public: virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx index d6e876f93ee9..246988d26775 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> // class VCLXAccessibleFixedHyperlink @@ -42,6 +42,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx index fc2616ecec53..c5a52e9d430d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> // class VCLXAccessibleFixedText @@ -42,6 +42,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 86b3a04238f5..7476f8603fd3 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELIST_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELIST_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELIST_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELIST_HXX #include <vector> #include <functional> -#include "accessibility/standard/vclxaccessiblelistitem.hxx" -#include <accessibility/standard/vclxaccessibleedit.hxx> +#include "standard/vclxaccessiblelistitem.hxx" +#include <standard/vclxaccessibleedit.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx index d015b4b79a4d..22d24eec687f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX -#include <accessibility/standard/vclxaccessiblebox.hxx> +#include <standard/vclxaccessiblebox.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> @@ -51,6 +51,6 @@ protected: virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index f851060c8248..1a1e2f958eae 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTITEM_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTITEM_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTITEM_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTITEM_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index 58484dba443e..98ba4ec19eac 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX -#include <accessibility/standard/vclxaccessiblemenuitem.hxx> +#include <standard/vclxaccessiblemenuitem.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <cppuhelper/implbase1.hxx> @@ -74,6 +74,6 @@ public: virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx index 261256a0e938..9ea5c585ae28 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX -#include <accessibility/standard/accessiblemenucomponent.hxx> +#include <standard/accessiblemenucomponent.hxx> #include <vcl/vclptr.hxx> class VclSimpleEvent; @@ -61,6 +61,6 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index 19d39f53202f..df2249ab6d22 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX -#include <accessibility/standard/accessiblemenuitemcomponent.hxx> +#include <standard/accessiblemenuitemcomponent.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> @@ -104,6 +104,6 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx index 4e3250b06f7b..065740cc2691 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX -#include <accessibility/standard/accessiblemenuitemcomponent.hxx> +#include <standard/accessiblemenuitemcomponent.hxx> // class VCLXAccessibleMenuSeparator @@ -41,6 +41,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx index d91ed83b2be5..bae088140c0a 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX -#include <accessibility/standard/accessiblemenucomponent.hxx> +#include <standard/accessiblemenucomponent.hxx> // class VCLXAccessiblePopupMenu @@ -47,6 +47,6 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx index ed0ac66abdca..8a13c7eb116a 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> @@ -71,6 +71,6 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index 6b8617f75ebf..40f51cceaa45 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> @@ -74,6 +74,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index 65c9e106366e..24fd96e8ad58 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <vcl/vclptr.hxx> @@ -69,6 +69,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 6e4b56f6e6e2..fb919df30207 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -129,6 +129,6 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index bfcbab4a8cd1..d024176132f4 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABCONTROL_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABCONTROL_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> @@ -91,6 +91,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 4749e6dd9a5d..4ea0d272a2cb 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -134,6 +134,6 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx index 391b14d3a6ab..b485f081173f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <vcl/vclptr.hxx> @@ -55,6 +55,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index 10390f508616..24cc9c34a3cb 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <comphelper/accessibletexthelper.hxx> @@ -80,6 +80,6 @@ public: }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index 58ec93b94392..d71b7c275e96 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index c5a5b4dbd821..63dfa107829a 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -16,8 +16,8 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOX_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOX_HXX #include <map> #include <toolkit/awt/vclxaccessiblecomponent.hxx> @@ -100,6 +100,6 @@ private: ); }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index 714d4588495c..3411640637c7 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -16,8 +16,8 @@ * 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_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX -#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX +#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX +#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -149,6 +149,6 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; }; -#endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX +#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index c1edec8deddc..70b7c1702c24 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleBrowseBox.hxx" -#include "accessibility/extended/AccessibleBrowseBoxTable.hxx" -#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx" +#include "extended/AccessibleBrowseBox.hxx" +#include "extended/AccessibleBrowseBoxTable.hxx" +#include "extended/AccessibleBrowseBoxHeaderBar.hxx" #include <svtools/accessibletableprovider.hxx> #include <comphelper/types.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -72,7 +72,7 @@ void AccessibleBrowseBox::setCreator( const css::uno::Reference< css::accessibil { #if OSL_DEBUG_LEVEL > 0 css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); - OSL_ENSURE( !xCreator.is(), "accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!" ); + OSL_ENSURE( !xCreator.is(), "extended/AccessibleBrowseBox::setCreator: creator already set!" ); #endif m_xImpl->m_aCreator = _rxCreator; } @@ -281,7 +281,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable() { css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); - OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" ); + OSL_ENSURE( xCreator.is(), "extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" ); return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox ); } @@ -333,7 +333,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL Accessibl ::osl::MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ), - "accessibility/extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" ); + "extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" ); // if the context died meanwhile (there is no listener, so it won't tell us explicitily when this happens), // then reset and re-create. diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 3387cbb91e30..1ff3c7558e26 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleBrowseBoxBase.hxx" +#include "extended/AccessibleBrowseBoxBase.hxx" #include <svtools/accessibletableprovider.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index cd805ae9d5fe..da37ca0baf0a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx> +#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <svtools/accessibletableprovider.hxx> diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 07225c233181..7cdefc5274a3 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx" +#include "extended/AccessibleBrowseBoxHeaderBar.hxx" #include <svtools/accessibletableprovider.hxx> #include <comphelper/servicehelper.hxx> @@ -43,7 +43,7 @@ AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar( AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType ) { OSL_ENSURE( isRowBar() || isColumnBar(), - "accessibility/extended/AccessibleBrowseBoxHeaderBar - invalid object type" ); + "extended/AccessibleBrowseBoxHeaderBar - invalid object type" ); } AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar() diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index c7332aafbea2..c40b79885200 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -18,9 +18,9 @@ */ -#include "accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx" +#include "extended/AccessibleBrowseBoxHeaderCell.hxx" #include <svtools/accessibletableprovider.hxx> -#include "accessibility/extended/AccessibleBrowseBox.hxx" +#include "extended/AccessibleBrowseBox.hxx" namespace accessibility { diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index f8ba7101202e..4123dd8b0cc9 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleBrowseBoxTable.hxx" +#include "extended/AccessibleBrowseBoxTable.hxx" #include <svtools/accessibletableprovider.hxx> diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 43faaca52cdc..0abc93ba7719 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx" +#include "extended/AccessibleBrowseBoxTableBase.hxx" #include <svtools/accessibletableprovider.hxx> #include <tools/multisel.hxx> #include <comphelper/sequence.hxx> diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index bcfe90550771..a8b5a5377184 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -18,7 +18,7 @@ */ -#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx" +#include "extended/AccessibleBrowseBoxTableCell.hxx" #include <svtools/accessibletableprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 5c32dcf0ac5a..d647bc8b0e4f 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleGridControl.hxx" -#include "accessibility/extended/AccessibleGridControlTable.hxx" -#include "accessibility/extended/AccessibleGridControlHeader.hxx" +#include "extended/AccessibleGridControl.hxx" +#include "extended/AccessibleGridControlTable.hxx" +#include "extended/AccessibleGridControlHeader.hxx" #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp> #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp> @@ -305,7 +305,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() { css::uno::Reference< css::accessibility::XAccessible > xCreator(m_xImpl->m_aCreator); - OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" ); + OSL_ENSURE( xCreator.is(), "extended/AccessibleGridControl::createAccessibleTable: my creator died - how this?" ); return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE ); } @@ -418,7 +418,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL Accessibl SolarMutexGuard g; OSL_ENSURE( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ), - "accessibility/extended/AccessibleGridControlAccess::getAccessibleContext: inconsistency!" ); + "extended/AccessibleGridControlAccess::getAccessibleContext: inconsistency!" ); // if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens), // then reset an re-create. diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 3f858f6968ae..088d56fcd432 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/AccessibleGridControlBase.hxx> +#include <extended/AccessibleGridControlBase.hxx> #include <svtools/accessibletable.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index dd34536640fd..c8d5c5551f2f 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleGridControlHeader.hxx" -#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx" -#include "accessibility/extended/AccessibleGridControlTableCell.hxx" +#include "extended/AccessibleGridControlHeader.hxx" +#include "extended/AccessibleGridControlHeaderCell.hxx" +#include "extended/AccessibleGridControlTableCell.hxx" #include <svtools/accessibletable.hxx> #include <comphelper/servicehelper.hxx> @@ -45,7 +45,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader( AccessibleGridControlTableBase( rxParent, rTable, eObjType ) { OSL_ENSURE( isRowBar() || isColumnBar(), - "accessibility/extended/AccessibleGridControlHeaderBar - invalid object type" ); + "extended/AccessibleGridControlHeaderBar - invalid object type" ); } AccessibleGridControlHeader::~AccessibleGridControlHeader() diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 0ce82c76adaa..8d9825936692 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -18,9 +18,9 @@ */ -#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx" +#include "extended/AccessibleGridControlHeaderCell.hxx" #include <svtools/accessibletable.hxx> -#include "accessibility/extended/AccessibleGridControl.hxx" +#include "extended/AccessibleGridControl.hxx" namespace accessibility { diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index faff58d6018e..bdf7ea23cfc0 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleGridControlTable.hxx" -#include "accessibility/extended/AccessibleGridControlTableCell.hxx" +#include "extended/AccessibleGridControlTable.hxx" +#include "extended/AccessibleGridControlTableCell.hxx" #include <svtools/accessibletable.hxx> diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index a226b6e9c9ff..a98e1f58b9c4 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/AccessibleGridControlTableBase.hxx" +#include "extended/AccessibleGridControlTableBase.hxx" #include <svtools/accessibletable.hxx> #include <tools/multisel.hxx> #include <comphelper/sequence.hxx> diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index b2ca0eefd176..85bd0022fe49 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -18,7 +18,7 @@ */ -#include "accessibility/extended/AccessibleGridControlTableCell.hxx" +#include "extended/AccessibleGridControlTableCell.hxx" #include <svtools/accessibletable.hxx> #include <tools/gen.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index e454f5a4372a..feaa074f214b 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -19,7 +19,7 @@ #include <sal/types.h> #include <svtools/accessibletableprovider.hxx> -#include <accessibility/extended/accessiblebrowseboxcell.hxx> +#include <extended/accessiblebrowseboxcell.hxx> namespace accessibility { diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index be7adb43ee73..7344acf3edce 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/accessibleeditbrowseboxcell.hxx> +#include <extended/accessibleeditbrowseboxcell.hxx> #include <svtools/editbrowsebox.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/accessibility/XAccessibleText.hpp> diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 172438bcfdeb..aa9d9abc5754 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/accessibleiconchoicectrl.hxx" -#include "accessibility/extended/accessibleiconchoicectrlentry.hxx" +#include "extended/accessibleiconchoicectrl.hxx" +#include "extended/accessibleiconchoicectrlentry.hxx" #include <svtools/ivctrl.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 1a3c24c322f8..119e603b4c7b 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/accessibleiconchoicectrlentry.hxx> +#include <extended/accessibleiconchoicectrlentry.hxx> #include <svtools/ivctrl.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 63c2b5d45efa..a1838a4c370d 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/accessiblelistbox.hxx> -#include <accessibility/extended/accessiblelistboxentry.hxx> +#include <extended/accessiblelistbox.hxx> +#include <extended/accessiblelistboxentry.hxx> #include <svtools/treelistbox.hxx> #include <svtools/treelistentry.hxx> #include <com/sun/star/awt/Point.hpp> diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 12af82ab3e8c..0999c432a19a 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/accessiblelistboxentry.hxx" +#include "extended/accessiblelistboxentry.hxx" #include <svtools/treelistbox.hxx> #include <svtools/stringtransfer.hxx> #include <svtools/svlbitm.hxx> @@ -40,8 +40,8 @@ #include <comphelper/sequence.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #define ACCESSIBLE_ACTION_COUNT 1 diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 9b5cd91e683b..750a37688a59 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/accessibletabbar.hxx> +#include <extended/accessibletabbar.hxx> #include <svtools/tabbar.hxx> -#include <accessibility/extended/accessibletabbarpagelist.hxx> +#include <extended/accessibletabbarpagelist.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index e103a0e818b8..11a26f8aa637 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "accessibility/extended/accessibletabbarbase.hxx" +#include "extended/accessibletabbarbase.hxx" #ifndef ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGELIST -#include "accessibility/extended/accessibletabbarpagelist.hxx" +#include "extended/accessibletabbarpagelist.hxx" #endif #include <toolkit/helper/externallock.hxx> #include <svtools/tabbar.hxx> diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index ad7f437d8002..c1d0a48f0182 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/accessibletabbarpage.hxx> +#include <extended/accessibletabbarpage.hxx> #include <svtools/tabbar.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 0ef33627c4c0..17e1fe9767cf 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/accessibletabbarpagelist.hxx> +#include <extended/accessibletabbarpagelist.hxx> #include <svtools/tabbar.hxx> -#include <accessibility/extended/accessibletabbarpage.hxx> +#include <extended/accessibletabbarpage.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index fccc8e8d300b..b92d0d82dbce 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -18,8 +18,8 @@ */ -#include "accessibility/extended/accessibletablistbox.hxx" -#include "accessibility/extended/accessibletablistboxtable.hxx" +#include "extended/accessibletablistbox.hxx" +#include "extended/accessibletablistboxtable.hxx" #include <svtools/svtabbx.hxx> #include <comphelper/sequence.hxx> diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 92f1a230221d..f13ad1619032 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -18,9 +18,9 @@ */ -#include "accessibility/extended/accessibletablistboxtable.hxx" -#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx" -#include "accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx" +#include "extended/accessibletablistboxtable.hxx" +#include "extended/AccessibleBrowseBoxTableCell.hxx" +#include "extended/AccessibleBrowseBoxCheckBoxCell.hxx" #include <svtools/svtabbx.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 47fb3b62b821..533b3e208e66 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/listboxaccessible.hxx> +#include <extended/listboxaccessible.hxx> #include <svtools/treelistbox.hxx> #include <vcl/svapp.hxx> diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 33454e83d6ab..61175803e86b 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/extended/textwindowaccessibility.hxx> +#include <extended/textwindowaccessibility.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/helper/IComboListBoxHelper.cxx b/accessibility/source/helper/IComboListBoxHelper.cxx index 1edaae97391e..5c3ce6b94076 100644 --- a/accessibility/source/helper/IComboListBoxHelper.cxx +++ b/accessibility/source/helper/IComboListBoxHelper.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <accessibility/helper/IComboListBoxHelper.hxx> +#include <helper/IComboListBoxHelper.hxx> namespace accessibility { diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 45587c9ccae5..f4c8597445c4 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -22,40 +22,40 @@ #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> -#include <accessibility/standard/vclxaccessiblecombobox.hxx> -#include <accessibility/standard/vclxaccessibledropdownlistbox.hxx> -#include <accessibility/standard/vclxaccessibleedit.hxx> -#include <accessibility/standard/vclxaccessiblefixedhyperlink.hxx> -#include <accessibility/standard/vclxaccessiblefixedtext.hxx> -#include <accessibility/standard/vclxaccessiblelistbox.hxx> -#include <accessibility/standard/vclxaccessiblemenu.hxx> -#include <accessibility/standard/vclxaccessibleradiobutton.hxx> -#include <accessibility/standard/vclxaccessiblescrollbar.hxx> -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> -#include <accessibility/standard/vclxaccessibletoolbox.hxx> +#include <standard/vclxaccessiblebutton.hxx> +#include <standard/vclxaccessiblecheckbox.hxx> +#include <standard/vclxaccessibledropdowncombobox.hxx> +#include <standard/vclxaccessiblecombobox.hxx> +#include <standard/vclxaccessibledropdownlistbox.hxx> +#include <standard/vclxaccessibleedit.hxx> +#include <standard/vclxaccessiblefixedhyperlink.hxx> +#include <standard/vclxaccessiblefixedtext.hxx> +#include <standard/vclxaccessiblelistbox.hxx> +#include <standard/vclxaccessiblemenu.hxx> +#include <standard/vclxaccessibleradiobutton.hxx> +#include <standard/vclxaccessiblescrollbar.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletoolbox.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <accessibility/standard/vclxaccessiblestatusbar.hxx> -#include <accessibility/standard/vclxaccessibletabcontrol.hxx> -#include <accessibility/standard/vclxaccessibletabpagewindow.hxx> -#include <accessibility/standard/vclxaccessiblemenubar.hxx> -#include <accessibility/standard/vclxaccessiblepopupmenu.hxx> -#include <accessibility/extended/accessibletablistbox.hxx> -#include <accessibility/extended/AccessibleBrowseBox.hxx> -#include <accessibility/extended/accessibleiconchoicectrl.hxx> -#include <accessibility/extended/accessibletabbar.hxx> -#include <accessibility/extended/accessiblelistbox.hxx> -#include <accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx> -#include <accessibility/extended/textwindowaccessibility.hxx> -#include <accessibility/extended/AccessibleBrowseBoxTableCell.hxx> -#include <accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx> -#include <accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx> -#include <accessibility/extended/accessibleeditbrowseboxcell.hxx> +#include <standard/vclxaccessiblestatusbar.hxx> +#include <standard/vclxaccessibletabcontrol.hxx> +#include <standard/vclxaccessibletabpagewindow.hxx> +#include <standard/vclxaccessiblemenubar.hxx> +#include <standard/vclxaccessiblepopupmenu.hxx> +#include <extended/accessibletablistbox.hxx> +#include <extended/AccessibleBrowseBox.hxx> +#include <extended/accessibleiconchoicectrl.hxx> +#include <extended/accessibletabbar.hxx> +#include <extended/accessiblelistbox.hxx> +#include <extended/AccessibleBrowseBoxHeaderBar.hxx> +#include <extended/textwindowaccessibility.hxx> +#include <extended/AccessibleBrowseBoxTableCell.hxx> +#include <extended/AccessibleBrowseBoxHeaderCell.hxx> +#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx> +#include <extended/accessibleeditbrowseboxcell.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> -#include <accessibility/extended/AccessibleGridControl.hxx> +#include <extended/AccessibleGridControl.hxx> #include <svtools/accessibletable.hxx> #include <vcl/popupmenuwindow.hxx> diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src index f112af3b48bb..63e30670df76 100644 --- a/accessibility/source/helper/accessiblestrings.src +++ b/accessibility/source/helper/accessiblestrings.src @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accessiblestrings.hrc> String RID_STR_ACC_ACTION_CLICK { diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 25c5a515fd08..ca09872bc8c3 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/helper/accresmgr.hxx> +#include <helper/accresmgr.hxx> #include <tools/simplerm.hxx> #include <vcl/svapp.hxx> diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index cc02ef63030e..4e33d1bc184a 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/helper/characterattributeshelper.hxx> +#include <helper/characterattributeshelper.hxx> #include <tools/gen.hxx> #include <comphelper/sequence.hxx> diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 9ef64b410fc6..4c4ecc7d624a 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/accessiblemenubasecomponent.hxx> -#include <accessibility/standard/vclxaccessiblemenu.hxx> -#include <accessibility/standard/vclxaccessiblemenuitem.hxx> -#include <accessibility/standard/vclxaccessiblemenuseparator.hxx> +#include <standard/accessiblemenubasecomponent.hxx> +#include <standard/vclxaccessiblemenu.hxx> +#include <standard/vclxaccessiblemenuitem.hxx> +#include <standard/vclxaccessiblemenuseparator.hxx> #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 16fe428bd6bc..2fc95d3afcca 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/accessiblemenucomponent.hxx> +#include <standard/accessiblemenucomponent.hxx> #include <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/convert.hxx> diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 41d27b01bcef..50a83c63192b 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/accessiblemenuitemcomponent.hxx> +#include <standard/accessiblemenuitemcomponent.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index ae4e5a66ac15..bee3e6d5ccad 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblebox.hxx> -#include <accessibility/standard/vclxaccessibletextfield.hxx> -#include <accessibility/standard/vclxaccessibleedit.hxx> -#include <accessibility/standard/vclxaccessiblelist.hxx> -#include <accessibility/helper/listboxhelper.hxx> +#include <standard/vclxaccessiblebox.hxx> +#include <standard/vclxaccessibletextfield.hxx> +#include <standard/vclxaccessibleedit.hxx> +#include <standard/vclxaccessiblelist.hxx> +#include <helper/listboxhelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> @@ -30,8 +30,8 @@ #include <vcl/svapp.hxx> #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 66da4236b020..99c8c6b15b52 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblebutton.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <standard/vclxaccessiblebutton.hxx> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/accessiblekeybindinghelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index c54e064d94b5..e66e236a8809 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblecheckbox.hxx> +#include <standard/vclxaccessiblecheckbox.hxx> #include <toolkit/awt/vclxwindows.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/accessiblekeybindinghelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 1da4234a4f6b..3ff31db6c0c6 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblecombobox.hxx> -#include <accessibility/standard/vclxaccessiblelist.hxx> +#include <standard/vclxaccessiblecombobox.hxx> +#include <standard/vclxaccessiblelist.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/svapp.hxx> diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 54c245cbb6ba..408e2be10a16 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibledropdowncombobox.hxx> -#include <accessibility/standard/vclxaccessiblecombobox.hxx> -#include <accessibility/standard/vclxaccessibletextfield.hxx> -#include <accessibility/standard/vclxaccessiblelist.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <standard/vclxaccessibledropdowncombobox.hxx> +#include <standard/vclxaccessiblecombobox.hxx> +#include <standard/vclxaccessibletextfield.hxx> +#include <standard/vclxaccessiblelist.hxx> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 67d060f46806..8e54c51f11d6 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -18,10 +18,10 @@ */ -#include <accessibility/standard/vclxaccessibledropdownlistbox.hxx> -#include <accessibility/standard/vclxaccessiblelistbox.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <standard/vclxaccessibledropdownlistbox.hxx> +#include <standard/vclxaccessiblelistbox.hxx> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 9ef00251c6ad..5d48aeaf7e7a 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibleedit.hxx> +#include <standard/vclxaccessibleedit.hxx> #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 9e2580f0594c..9ea2234345a8 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblefixedhyperlink.hxx> +#include <standard/vclxaccessiblefixedhyperlink.hxx> using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index b6645b356aff..3a8744815870 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblefixedtext.hxx> +#include <standard/vclxaccessiblefixedtext.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index c425f3c204d5..66e1fa2d5134 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblelist.hxx> -#include <accessibility/standard/vclxaccessiblelistitem.hxx> -#include <accessibility/helper/listboxhelper.hxx> +#include <standard/vclxaccessiblelist.hxx> +#include <standard/vclxaccessiblelistitem.hxx> +#include <helper/listboxhelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 0db8a0671670..5c9c34e1a1c3 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblelistbox.hxx> -#include <accessibility/standard/vclxaccessiblelistitem.hxx> -#include <accessibility/helper/listboxhelper.hxx> +#include <standard/vclxaccessiblelistbox.hxx> +#include <standard/vclxaccessiblelistitem.hxx> +#include <helper/listboxhelper.hxx> #include <algorithm> diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 26cd9d842906..c950953babe1 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblelistitem.hxx> +#include <standard/vclxaccessiblelistitem.hxx> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/listboxhelper.hxx> +#include <helper/listboxhelper.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index a251fdd21b63..7fc965960cbd 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblemenu.hxx> +#include <standard/vclxaccessiblemenu.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/menu.hxx> diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 17b3cb46d9b7..fead9be98f11 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblemenubar.hxx> +#include <standard/vclxaccessiblemenubar.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/svapp.hxx> diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 074fb357a05d..533def411843 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblemenuitem.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <standard/vclxaccessiblemenuitem.hxx> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/characterattributeshelper.hxx> +#include <helper/characterattributeshelper.hxx> #include <comphelper/accessiblekeybindinghelper.hxx> #include <com/sun/star/awt/KeyModifier.hpp> diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index 8c58c3fc285a..a7d9cdda042d 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblemenuseparator.hxx> +#include <standard/vclxaccessiblemenuseparator.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 6d48f189b9ce..a3c77b28fc42 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblepopupmenu.hxx> +#include <standard/vclxaccessiblepopupmenu.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/svapp.hxx> diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index d9ad6f09e52e..1951db4420e0 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibleradiobutton.hxx> +#include <standard/vclxaccessibleradiobutton.hxx> #include <toolkit/awt/vclxwindows.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index f3675f7a57db..8da901e7b0e3 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblescrollbar.hxx> +#include <standard/vclxaccessiblescrollbar.hxx> #include <toolkit/awt/vclxwindows.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 25029fa85778..5499e62efd1e 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblestatusbar.hxx> -#include <accessibility/standard/vclxaccessiblestatusbaritem.hxx> +#include <standard/vclxaccessiblestatusbar.hxx> +#include <standard/vclxaccessiblestatusbaritem.hxx> #include <toolkit/helper/convert.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/status.hxx> diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 0f4c1b1f5eef..ae8526f421c9 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessiblestatusbaritem.hxx> +#include <standard/vclxaccessiblestatusbaritem.hxx> #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/characterattributeshelper.hxx> +#include <helper/characterattributeshelper.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index e9ee495f527e..2f3be213e90f 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibletabcontrol.hxx> -#include <accessibility/standard/vclxaccessibletabpage.hxx> +#include <standard/vclxaccessibletabcontrol.hxx> +#include <standard/vclxaccessibletabpage.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index bb70bdf77880..f8dd10442a42 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibletabpage.hxx> +#include <standard/vclxaccessibletabpage.hxx> #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/characterattributeshelper.hxx> +#include <helper/characterattributeshelper.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index 430b4a4937cf..94283017d80e 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibletabpagewindow.hxx> +#include <standard/vclxaccessibletabpagewindow.hxx> #include <toolkit/helper/convert.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 159898b7e48b..8a0543f676e0 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibletextcomponent.hxx> +#include <standard/vclxaccessibletextcomponent.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/characterattributeshelper.hxx> +#include <helper/characterattributeshelper.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index 71c647e77da0..0b34a576dc77 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibletextfield.hxx> +#include <standard/vclxaccessibletextfield.hxx> #include <vcl/lstbox.hxx> -#include <accessibility/helper/listboxhelper.hxx> +#include <helper/listboxhelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 5e830ecab06e..9efb9266ae30 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -18,8 +18,8 @@ */ #include <string.h> -#include <accessibility/standard/vclxaccessibletoolbox.hxx> -#include <accessibility/standard/vclxaccessibletoolboxitem.hxx> +#include <standard/vclxaccessibletoolbox.hxx> +#include <standard/vclxaccessibletoolboxitem.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index fc4c7ed15fbb..f772b7f11789 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <accessibility/standard/vclxaccessibletoolboxitem.hxx> +#include <standard/vclxaccessibletoolboxitem.hxx> #include <toolkit/helper/convert.hxx> -#include <accessibility/helper/accresmgr.hxx> -#include <accessibility/helper/accessiblestrings.hrc> +#include <helper/accresmgr.hxx> +#include <helper/accessiblestrings.hrc> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx b/bridges/inc/arraypointer.hxx index c5018c32b967..84e5297f3eb4 100644 --- a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx +++ b/bridges/inc/arraypointer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX +#ifndef INCLUDED_BRIDGES_INC_ARRAYPOINTER_HXX +#define INCLUDED_BRIDGES_INC_ARRAYPOINTER_HXX #include "sal/config.h" diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridge.hxx index 9cfa92bcddef..5e3b146217b0 100644 --- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx +++ b/bridges/inc/bridge.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX +#ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX +#define INCLUDED_BRIDGES_INC_BRIDGE_HXX #include "osl/interlck.h" #include "sal/types.h" diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index 4002af6395b3..13a2b2235f02 100644 --- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX +#ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX +#define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX #include "osl/interlck.h" #include "rtl/ustring.hxx" @@ -26,7 +26,7 @@ #include "typelib/typedescription.h" #include "uno/dispatcher.h" #include "uno/environment.h" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "vtablefactory.hxx" namespace com { namespace sun { namespace star { namespace uno { class XInterface; diff --git a/bridges/inc/bridges/cpp_uno/shared/except.hxx b/bridges/inc/except.hxx index fcb455297bf2..32e911321161 100644 --- a/bridges/inc/bridges/cpp_uno/shared/except.hxx +++ b/bridges/inc/except.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_EXCEPT_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_EXCEPT_HXX +#ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX +#define INCLUDED_BRIDGES_INC_EXCEPT_HXX #if _MSC_VER >= 1900 // VC 2015 (and later?) // extern "C" void** __cdecl __current_exception() diff --git a/bridges/inc/bridges/cpp_uno/shared/types.hxx b/bridges/inc/types.hxx index d5ecd5eb2c25..12e8812b5c8e 100644 --- a/bridges/inc/bridges/cpp_uno/shared/types.hxx +++ b/bridges/inc/types.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_TYPES_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_TYPES_HXX +#ifndef INCLUDED_BRIDGES_INC_TYPES_HXX +#define INCLUDED_BRIDGES_INC_TYPES_HXX #include "typelib/typeclass.h" #include "typelib/typedescription.h" diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx index f678765b7826..c9697d3491a8 100644 --- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx +++ b/bridges/inc/unointerfaceproxy.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX +#ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX +#define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX #include "osl/interlck.h" #include "rtl/ustring.hxx" diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx index 19fe4e7a0fa5..7e8566e72ec4 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/vtablefactory.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX +#ifndef INCLUDED_BRIDGES_INC_VTABLEFACTORY_HXX +#define INCLUDED_BRIDGES_INC_VTABLEFACTORY_HXX #include "osl/mutex.hxx" #include "rtl/alloc.h" diff --git a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx b/bridges/inc/vtables.hxx index ee9a2a3deea2..cd4c2f183c02 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx +++ b/bridges/inc/vtables.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX -#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX +#ifndef INCLUDED_BRIDGES_INC_VTABLES_HXX +#define INCLUDED_BRIDGES_INC_VTABLES_HXX #include "sal/types.h" #include "typelib/typedescription.h" diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx index 0bb976716435..35dff67c18b6 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx @@ -22,10 +22,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx index 8c2c0c061df9..5996460314a2 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx index 9bd110a4b1da..64a214f1f142 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx @@ -39,10 +39,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx index 98ac5173eb8a..1f77e4970791 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx @@ -32,10 +32,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx index 5eb41411db75..addf41403bc3 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx @@ -35,10 +35,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx index 5fc6d624104d..46726a8b30ba 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx @@ -20,7 +20,7 @@ // If we eventually get around to factoring out stuff from // cpp2uno-arm.cxx and cpp2uno-i386.cxx here, this is where to put it. -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "vtablefactory.hxx" void bridges::cpp_uno::shared::VtableFactory::flushCode( unsigned char const *, unsigned char const *) diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx index 718bc980ef81..a48d88a36885 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx @@ -31,10 +31,10 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <sal/log.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx index 78e38fea6d2d..24a5704a6bfd 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx @@ -21,10 +21,10 @@ #include <com/sun/star/uno/RuntimeException.hpp> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx index 54af31e6c9d8..0102ea186196 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx @@ -26,10 +26,10 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <sal/log.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx index 1ab4839fd88d..17bd59583737 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx index 7f23e1ef5c6b..e700aa8fd86a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx @@ -35,10 +35,10 @@ #include <typelib/typedescription.h> #include <typelib/typedescription.hxx> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/cppinterfaceproxy.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include <bridges/cpp_uno/shared/vtablefactory.hxx> +#include <bridge.hxx> +#include <cppinterfaceproxy.hxx> +#include <types.hxx> +#include <vtablefactory.hxx> #include <abi.hxx> diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx index aa484bc2668c..4e7d69b0a871 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx @@ -26,10 +26,10 @@ #include <cxxabi.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include <bridges/cpp_uno/shared/unointerfaceproxy.hxx> -#include <bridges/cpp_uno/shared/vtables.hxx> +#include <bridge.hxx> +#include <types.hxx> +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/genfunc.hxx> diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index f132d7e8c728..7425acdcc66d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -23,10 +23,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index 4c04088016fc..d13e2dd3eeb7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index c7b5fd94cbc0..1dbf12f92f60 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -28,10 +28,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index f9960819bde7..8942d1f948bd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -24,10 +24,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include <bridges/cpp_uno/shared/unointerfaceproxy.hxx> -#include <bridges/cpp_uno/shared/vtables.hxx> +#include <bridge.hxx> +#include <types.hxx> +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx index e992110f9807..29f01bfbdede 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx @@ -24,10 +24,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include <bridges/cpp_uno/shared/unointerfaceproxy.hxx> -#include <bridges/cpp_uno/shared/vtables.hxx> +#include <bridge.hxx> +#include <types.hxx> +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index d20cc0b7476f..97377d760430 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -28,10 +28,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index 86958ad8f94a..730f38f69022 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -24,10 +24,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include <bridges/cpp_uno/shared/unointerfaceproxy.hxx> -#include <bridges/cpp_uno/shared/vtables.hxx> +#include <bridge.hxx> +#include <types.hxx> +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index ec333fd659c5..7874de3dab51 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -23,10 +23,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx index a24dd4078bd7..1b24c9253b4b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx @@ -24,7 +24,7 @@ #include <typeinfo> #include <exception> #include <cstddef> -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "vtablefactory.hxx" namespace CPPU_CURRENT_NAMESPACE { diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index a395a5dd8c17..b87a848a3ff3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 70784124d0be..fcbe63047345 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -24,10 +24,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "call.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index 351bac12a1d2..d7679ea5e490 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -24,10 +24,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "callvirtualmethod.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index 824993d88d9f..53851c25be97 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -28,10 +28,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index b5b8606b46ee..2808dc45b38d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -24,10 +24,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include <bridges/cpp_uno/shared/unointerfaceproxy.hxx> -#include <bridges/cpp_uno/shared/vtables.hxx> +#include <bridge.hxx> +#include <types.hxx> +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 6e0a7dc72eb3..aeb07301d18f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -21,10 +21,10 @@ #include <typelib/typedescription.hxx> #include <uno/data.h> #include <osl/endian.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index 8d904658775f..74fb519f5ea2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -22,10 +22,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx index 8f510c82ecc6..fba5df3a3457 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx @@ -21,10 +21,10 @@ #include <typelib/typedescription.hxx> #include <uno/data.h> #include <osl/endian.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "call.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx index 859ffe5b3142..d2a3c1c3c0f3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index 69a590cb6b6f..f3327f9d7ce3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -25,10 +25,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx index 6b26bcdd4d45..070c899215d3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 6ac003b2ab8f..f9384a5ec057 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -23,10 +23,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> #include <osl/endian.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index 28dfaf8f118e..7beb1a330ecb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index a14021ea5ae0..a9d386f98dc5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -23,10 +23,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index 575e22dfd98e..0b19523a4594 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index 82fd47258734..7db6d13422c1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -23,10 +23,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <stdio.h> diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index ac6260c1caec..0e206f891424 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index 966bac6a1366..b47f81f94a56 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -21,10 +21,10 @@ #include <sal/log.hxx> #include <typelib/typedescription.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" using namespace com::sun::star::uno; diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index 5f105abdd0cd..817955d9b9fa 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -21,10 +21,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index c30249d08af7..c389edefbca8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -31,10 +31,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "abi.hxx" #include "call.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 647d3ec38b09..71e76a9f3b09 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -29,10 +29,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include <bridge.hxx> +#include <types.hxx> +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "abi.hxx" #include "callvirtualmethod.hxx" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index d80a66a860b6..6786c9530150 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -30,10 +30,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "abi.hxx" #include "call.hxx" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 1555f55b7bf8..ecf906633966 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -29,10 +29,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include <bridge.hxx> +#include <types.hxx> +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "abi.hxx" #include "callvirtualmethod.hxx" diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx index 00f9bdca31e6..1f54296fce11 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx @@ -21,10 +21,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index aee85cc7eae2..21c5722d76be 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -27,10 +27,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx index e031f7f877dd..977f934e939f 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx @@ -25,10 +25,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 4b22dc843076..949912276d39 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -21,10 +21,10 @@ #include <sal/log.hxx> #include <typelib/typedescription.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include <sal/alloca.h> diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index 132e31dddabc..91abdaabae9a 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -21,10 +21,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index abe666fc8ddb..d69366938b18 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -25,10 +25,10 @@ #include <sal/alloca.h> #include <sal/log.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "share.hxx" #include "smallstruct.hxx" diff --git a/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx b/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx index 2f617e96cd37..58c0338630f2 100644 --- a/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx +++ b/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx @@ -18,7 +18,7 @@ */ -#include "bridges/cpp_uno/shared/types.hxx" +#include "types.hxx" #include "typelib/typeclass.h" #include "typelib/typedescription.h" diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx index 75c3a34dc61f..5353da36848a 100644 --- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <uno/data.h> #include <sal/alloca.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "callvirtualmethod.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx index 08c7b7b3df87..d64252008ae1 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx @@ -30,10 +30,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "abi.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx index 9706f0cc2d04..88dc1532a2cf 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx @@ -28,10 +28,10 @@ #include <uno/data.h> #include <sal/alloca.h> -#include <bridges/cpp_uno/shared/bridge.hxx> -#include <bridges/cpp_uno/shared/types.hxx> -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include <bridge.hxx> +#include <types.hxx> +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "abi.hxx" #include "callvirtualmethod.hxx" diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 58e4d642efe4..62480db64929 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -25,10 +25,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "msci.hxx" diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index f8c4ff6bfeba..d6c6271802c7 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -33,7 +33,7 @@ #include "com/sun/star/uno/Any.hxx" #include <unordered_map> #include "msci.hxx" -#include "bridges/cpp_uno/shared/except.hxx" +#include "except.hxx" #pragma pack(push, 8) diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index f1007dd55aec..bbc7fb985709 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -23,10 +23,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "msci.hxx" diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index a1a27c126970..c1a650bbc81f 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -25,10 +25,10 @@ #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "cppinterfaceproxy.hxx" +#include "types.hxx" +#include "vtablefactory.hxx" #include "mscx.hxx" diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 9d8056d1fdc4..f66e9b15b6cc 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -250,7 +250,7 @@ void #include "com/sun/star/uno/Any.hxx" #include <unordered_map> #include "mscx.hxx" -#include "bridges/cpp_uno/shared/except.hxx" +#include "except.hxx" //TOOD: Work around missing __CxxDetectRethrow in clang-cl for now (predefined // in cl, <www.geoffchappell.com/studies/msvc/language/predefined/index.html>): diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx index 05d3ec9f7408..4e455f9d4a44 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx @@ -26,10 +26,10 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/types.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "bridge.hxx" +#include "types.hxx" +#include "unointerfaceproxy.hxx" +#include "vtables.hxx" #include "mscx.hxx" diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx index 42b83f8a9f79..004f8954986e 100644 --- a/bridges/source/cpp_uno/shared/bridge.cxx +++ b/bridges/source/cpp_uno/shared/bridge.cxx @@ -18,10 +18,10 @@ */ -#include "bridges/cpp_uno/shared/bridge.hxx" +#include "bridge.hxx" -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" +#include "cppinterfaceproxy.hxx" +#include "unointerfaceproxy.hxx" #include "com/sun/star/uno/XInterface.hpp" #include "osl/interlck.h" diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 97a0214f6705..0e5759239d5b 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "bridges/cpp_uno/shared/bridge.hxx" +#include "bridge.hxx" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index ec8c33a7f42e..f7f2eda4777e 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" +#include "cppinterfaceproxy.hxx" #include "guardedarray.hxx" -#include "bridges/cpp_uno/shared/bridge.hxx" -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "bridge.hxx" +#include "vtablefactory.hxx" #include "com/sun/star/uno/XInterface.hpp" #include "osl/getglobalmutex.hxx" diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx index 07b048dda239..a4bdb1bbe25f 100644 --- a/bridges/source/cpp_uno/shared/types.cxx +++ b/bridges/source/cpp_uno/shared/types.cxx @@ -18,7 +18,7 @@ */ -#include "bridges/cpp_uno/shared/types.hxx" +#include "types.hxx" #include "typelib/typeclass.h" #include "typelib/typedescription.h" diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx index 6b7aae26649e..e36ced8e5d6e 100644 --- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" +#include "unointerfaceproxy.hxx" -#include "bridges/cpp_uno/shared/bridge.hxx" +#include "bridge.hxx" #include "com/sun/star/uno/XInterface.hpp" #include "osl/interlck.h" diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 3e1564c844ef..c2c6b8e93ecb 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -18,11 +18,11 @@ */ -#include "bridges/cpp_uno/shared/vtablefactory.hxx" +#include "vtablefactory.hxx" #include "guardedarray.hxx" -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "vtables.hxx" #include "osl/thread.h" #include "osl/security.hxx" diff --git a/bridges/source/cpp_uno/shared/vtables.cxx b/bridges/source/cpp_uno/shared/vtables.cxx index 2571cc80d5b5..4e70a2c5e44e 100644 --- a/bridges/source/cpp_uno/shared/vtables.cxx +++ b/bridges/source/cpp_uno/shared/vtables.cxx @@ -18,7 +18,7 @@ */ -#include "bridges/cpp_uno/shared/vtables.hxx" +#include "vtables.hxx" #include "sal/types.h" #include "typelib/typedescription.h" diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/astattribute.hxx index 86e4c0de7c74..2d88b47e4082 100644 --- a/idlc/inc/idlc/astattribute.hxx +++ b/idlc/inc/astattribute.hxx @@ -16,11 +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_IDLC_INC_IDLC_ASTATTRIBUTE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX +#ifndef INCLUDED_IDLC_INC_ASTATTRIBUTE_HXX +#define INCLUDED_IDLC_INC_ASTATTRIBUTE_HXX -#include <idlc/astdeclaration.hxx> -#include "idlc/astscope.hxx" +#include <astdeclaration.hxx> +#include "astscope.hxx" #include <registry/types.hxx> #include <rtl/ustring.hxx> @@ -105,6 +105,6 @@ private: DeclList m_setExceptions; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTATTRIBUTE_HXX +#endif // INCLUDED_IDLC_INC_ASTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/astbasetype.hxx index 048e8bb42b1a..a7edf3d817b0 100644 --- a/idlc/inc/idlc/astbasetype.hxx +++ b/idlc/inc/astbasetype.hxx @@ -16,11 +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_IDLC_INC_IDLC_ASTBASETYPE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX +#ifndef INCLUDED_IDLC_INC_ASTBASETYPE_HXX +#define INCLUDED_IDLC_INC_ASTBASETYPE_HXX -#include <idlc/asttype.hxx> -#include <idlc/astexpression.hxx> +#include <asttype.hxx> +#include <astexpression.hxx> class AstBaseType : public AstType @@ -50,6 +50,6 @@ private: const ExprType m_exprType; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTBASETYPE_HXX +#endif // INCLUDED_IDLC_INC_ASTBASETYPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/astconstant.hxx index cfad728f6aaf..7453c47954b3 100644 --- a/idlc/inc/idlc/astconstant.hxx +++ b/idlc/inc/astconstant.hxx @@ -16,11 +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_IDLC_INC_IDLC_ASTCONSTANT_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX +#ifndef INCLUDED_IDLC_INC_ASTCONSTANT_HXX +#define INCLUDED_IDLC_INC_ASTCONSTANT_HXX -#include <idlc/astdeclaration.hxx> -#include <idlc/astexpression.hxx> +#include <astdeclaration.hxx> +#include <astexpression.hxx> namespace typereg { class Writer; } @@ -45,6 +45,6 @@ private: const ExprType m_constValueType; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTCONSTANT_HXX +#endif // INCLUDED_IDLC_INC_ASTCONSTANT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/astconstants.hxx index 65b2da863dca..f3f7f3bed2d1 100644 --- a/idlc/inc/idlc/astconstants.hxx +++ b/idlc/inc/astconstants.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTCONSTANTS_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX +#ifndef INCLUDED_IDLC_INC_ASTCONSTANTS_HXX +#define INCLUDED_IDLC_INC_ASTCONSTANTS_HXX -#include <idlc/astmodule.hxx> +#include <astmodule.hxx> class AstConstants : public AstModule { @@ -30,6 +30,6 @@ public: virtual ~AstConstants() {} }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTCONSTANTS_HXX +#endif // INCLUDED_IDLC_INC_ASTCONSTANTS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/astdeclaration.hxx index 6b329e961a7c..c6a76d9aa4a2 100644 --- a/idlc/inc/idlc/astdeclaration.hxx +++ b/idlc/inc/astdeclaration.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTDECLARATION_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX +#ifndef INCLUDED_IDLC_INC_ASTDECLARATION_HXX +#define INCLUDED_IDLC_INC_ASTDECLARATION_HXX -#include <idlc/idlc.hxx> +#include <idlc.hxx> #include <registry/registry.hxx> class AstScope; @@ -127,6 +127,6 @@ protected: OUString m_documentation; // fileName defined in }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTDECLARATION_HXX +#endif // INCLUDED_IDLC_INC_ASTDECLARATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/astenum.hxx index 0bdf764905a6..c60ff2839bfe 100644 --- a/idlc/inc/idlc/astenum.hxx +++ b/idlc/inc/astenum.hxx @@ -16,12 +16,12 @@ * 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_IDLC_INC_IDLC_ASTENUM_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX +#ifndef INCLUDED_IDLC_INC_ASTENUM_HXX +#define INCLUDED_IDLC_INC_ASTENUM_HXX -#include <idlc/asttype.hxx> -#include <idlc/astscope.hxx> -#include <idlc/astconstant.hxx> +#include <asttype.hxx> +#include <astscope.hxx> +#include <astconstant.hxx> class AstEnum : public AstType , public AstScope @@ -43,6 +43,6 @@ private: sal_Int32 m_enumValueCount; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTENUM_HXX +#endif // INCLUDED_IDLC_INC_ASTENUM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/astexception.hxx index efa9805d868f..64790c694048 100644 --- a/idlc/inc/idlc/astexception.hxx +++ b/idlc/inc/astexception.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTEXCEPTION_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX +#ifndef INCLUDED_IDLC_INC_ASTEXCEPTION_HXX +#define INCLUDED_IDLC_INC_ASTEXCEPTION_HXX -#include <idlc/aststruct.hxx> +#include <aststruct.hxx> class AstException : public AstStruct { @@ -31,6 +31,6 @@ public: virtual ~AstException() {} }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTEXCEPTION_HXX +#endif // INCLUDED_IDLC_INC_ASTEXCEPTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/astexpression.hxx index 4e51e8bfb51a..ca060719ef2e 100644 --- a/idlc/inc/idlc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -16,14 +16,14 @@ * 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_IDLC_INC_IDLC_ASTEXPRESSION_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX +#ifndef INCLUDED_IDLC_INC_ASTEXPRESSION_HXX +#define INCLUDED_IDLC_INC_ASTEXPRESSION_HXX #include <sal/config.h> #include <memory> -#include <idlc/idlc.hxx> +#include <idlc.hxx> // Enum to define all the different operators to combine expressions enum ExprComb @@ -138,6 +138,6 @@ private: OString* m_pSymbolicName; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTEXPRESSION_HXX +#endif // INCLUDED_IDLC_INC_ASTEXPRESSION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/astinterface.hxx index 99f9dee5eea5..caabbe669f11 100644 --- a/idlc/inc/idlc/astinterface.hxx +++ b/idlc/inc/astinterface.hxx @@ -16,12 +16,12 @@ * 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_IDLC_INC_IDLC_ASTINTERFACE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX +#ifndef INCLUDED_IDLC_INC_ASTINTERFACE_HXX +#define INCLUDED_IDLC_INC_ASTINTERFACE_HXX -#include <idlc/asttype.hxx> -#include <idlc/astscope.hxx> -#include "idlc/inheritedinterface.hxx" +#include <asttype.hxx> +#include <astscope.hxx> +#include "inheritedinterface.hxx" #include <map> #include <vector> @@ -121,6 +121,6 @@ private: VisibleMembers m_visibleMembers; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTINTERFACE_HXX +#endif // INCLUDED_IDLC_INC_ASTINTERFACE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/astinterfacemember.hxx index faaba11b939d..1740d3518085 100644 --- a/idlc/inc/idlc/astinterfacemember.hxx +++ b/idlc/inc/astinterfacemember.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX +#ifndef INCLUDED_IDLC_INC_ASTINTERFACEMEMBER_HXX +#define INCLUDED_IDLC_INC_ASTINTERFACEMEMBER_HXX -#include <idlc/astinterface.hxx> +#include <astinterface.hxx> class AstInterfaceMember : public AstDeclaration { @@ -41,6 +41,6 @@ private: AstInterface* m_pRealInterface; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTINTERFACEMEMBER_HXX +#endif // INCLUDED_IDLC_INC_ASTINTERFACEMEMBER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/astmember.hxx index 52a5042e0226..d01dbde7922c 100644 --- a/idlc/inc/idlc/astmember.hxx +++ b/idlc/inc/astmember.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_IDLC_INC_IDLC_ASTMEMBER_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTMEMBER_HXX +#ifndef INCLUDED_IDLC_INC_ASTMEMBER_HXX +#define INCLUDED_IDLC_INC_ASTMEMBER_HXX -#include "idlc/astdeclaration.hxx" +#include "astdeclaration.hxx" class AstScope; class AstType; diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/astmodule.hxx index 37bf965a7c05..770c11a856a9 100644 --- a/idlc/inc/idlc/astmodule.hxx +++ b/idlc/inc/astmodule.hxx @@ -16,11 +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_IDLC_INC_IDLC_ASTMODULE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX +#ifndef INCLUDED_IDLC_INC_ASTMODULE_HXX +#define INCLUDED_IDLC_INC_ASTMODULE_HXX -#include <idlc/astdeclaration.hxx> -#include <idlc/astscope.hxx> +#include <astdeclaration.hxx> +#include <astscope.hxx> class AstModule : public AstDeclaration , public AstScope @@ -39,6 +39,6 @@ public: virtual bool dump(RegistryKey& rKey) override; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTMODULE_HXX +#endif // INCLUDED_IDLC_INC_ASTMODULE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/astneeds.hxx index f96a2bb82690..6674e2804695 100644 --- a/idlc/inc/idlc/astneeds.hxx +++ b/idlc/inc/astneeds.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTNEEDS_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX +#ifndef INCLUDED_IDLC_INC_ASTNEEDS_HXX +#define INCLUDED_IDLC_INC_ASTNEEDS_HXX -#include <idlc/astservice.hxx> +#include <astservice.hxx> class AstNeeds : public AstDeclaration { @@ -36,6 +36,6 @@ private: AstService* m_pRealService; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTNEEDS_HXX +#endif // INCLUDED_IDLC_INC_ASTNEEDS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/astobserves.hxx index 9f84d0cbeecb..c7760096a095 100644 --- a/idlc/inc/idlc/astobserves.hxx +++ b/idlc/inc/astobserves.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTOBSERVES_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX +#ifndef INCLUDED_IDLC_INC_ASTOBSERVES_HXX +#define INCLUDED_IDLC_INC_ASTOBSERVES_HXX -#include <idlc/astinterface.hxx> +#include <astinterface.hxx> class AstObserves : public AstDeclaration { @@ -36,6 +36,6 @@ private: AstInterface* m_pRealInterface; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTOBSERVES_HXX +#endif // INCLUDED_IDLC_INC_ASTOBSERVES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/astoperation.hxx index a0a4f7b86cc6..775c74fc0c43 100644 --- a/idlc/inc/idlc/astoperation.hxx +++ b/idlc/inc/astoperation.hxx @@ -16,11 +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_IDLC_INC_IDLC_ASTOPERATION_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX +#ifndef INCLUDED_IDLC_INC_ASTOPERATION_HXX +#define INCLUDED_IDLC_INC_ASTOPERATION_HXX -#include <idlc/astdeclaration.hxx> -#include <idlc/astscope.hxx> +#include <astdeclaration.hxx> +#include <astscope.hxx> namespace typereg { class Writer; } @@ -54,6 +54,6 @@ private: DeclList m_exceptions; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTOPERATION_HXX +#endif // INCLUDED_IDLC_INC_ASTOPERATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/astparameter.hxx index 18a84d3583f7..250aeaed33f5 100644 --- a/idlc/inc/idlc/astparameter.hxx +++ b/idlc/inc/astparameter.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_IDLC_INC_IDLC_ASTPARAMETER_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTPARAMETER_HXX +#ifndef INCLUDED_IDLC_INC_ASTPARAMETER_HXX +#define INCLUDED_IDLC_INC_ASTPARAMETER_HXX -#include <idlc/astmember.hxx> +#include <astmember.hxx> enum Direction { DIR_IN, DIR_OUT, DIR_INOUT }; diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/astscope.hxx index c7d64a16dc2e..9db54d61aa13 100644 --- a/idlc/inc/idlc/astscope.hxx +++ b/idlc/inc/astscope.hxx @@ -16,14 +16,14 @@ * 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_IDLC_INC_IDLC_ASTSCOPE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX +#ifndef INCLUDED_IDLC_INC_ASTSCOPE_HXX +#define INCLUDED_IDLC_INC_ASTSCOPE_HXX -#include <idlc/idlc.hxx> +#include <idlc.hxx> class AstExpression; -#include <idlc/astdeclaration.hxx> -#include <idlc/astexpression.hxx> +#include <astdeclaration.hxx> +#include <astexpression.hxx> class AstScope { @@ -65,6 +65,6 @@ private: NodeType m_nodeType; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTSCOPE_HXX +#endif // INCLUDED_IDLC_INC_ASTSCOPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/astsequence.hxx index 1eefbea3f949..bdc132872455 100644 --- a/idlc/inc/idlc/astsequence.hxx +++ b/idlc/inc/astsequence.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTSEQUENCE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX +#ifndef INCLUDED_IDLC_INC_ASTSEQUENCE_HXX +#define INCLUDED_IDLC_INC_ASTSEQUENCE_HXX -#include <idlc/asttype.hxx> +#include <asttype.hxx> class AstSequence : public AstType { @@ -47,6 +47,6 @@ private: mutable OString* m_pRelativName; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTSEQUENCE_HXX +#endif // INCLUDED_IDLC_INC_ASTSEQUENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/astservice.hxx index 8112db6a3652..400e7c6f2313 100644 --- a/idlc/inc/idlc/astservice.hxx +++ b/idlc/inc/astservice.hxx @@ -16,11 +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_IDLC_INC_IDLC_ASTSERVICE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX +#ifndef INCLUDED_IDLC_INC_ASTSERVICE_HXX +#define INCLUDED_IDLC_INC_ASTSERVICE_HXX -#include <idlc/astdeclaration.hxx> -#include <idlc/astscope.hxx> +#include <astdeclaration.hxx> +#include <astscope.hxx> class AstService : public AstDeclaration , public AstScope @@ -57,6 +57,6 @@ private: bool m_defaultConstructor; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTSERVICE_HXX +#endif // INCLUDED_IDLC_INC_ASTSERVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/astservicemember.hxx index 0f08527211d8..13cd97298bf7 100644 --- a/idlc/inc/idlc/astservicemember.hxx +++ b/idlc/inc/astservicemember.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX +#ifndef INCLUDED_IDLC_INC_ASTSERVICEMEMBER_HXX +#define INCLUDED_IDLC_INC_ASTSERVICEMEMBER_HXX -#include <idlc/astservice.hxx> +#include <astservice.hxx> class AstServiceMember : public AstDeclaration { @@ -41,6 +41,6 @@ private: AstService* m_pRealService; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTSERVICEMEMBER_HXX +#endif // INCLUDED_IDLC_INC_ASTSERVICEMEMBER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/aststack.hxx index 0a63c31e2331..c704e91f91b3 100644 --- a/idlc/inc/idlc/aststack.hxx +++ b/idlc/inc/aststack.hxx @@ -16,8 +16,8 @@ * 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_IDLC_INC_IDLC_ASTSTACK_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX +#ifndef INCLUDED_IDLC_INC_ASTSTACK_HXX +#define INCLUDED_IDLC_INC_ASTSTACK_HXX #include <sal/types.h> @@ -44,6 +44,6 @@ private: sal_uInt32 m_top; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTSTACK_HXX +#endif // INCLUDED_IDLC_INC_ASTSTACK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/aststruct.hxx index 2a3330bf6114..280f23165d43 100644 --- a/idlc/inc/idlc/aststruct.hxx +++ b/idlc/inc/aststruct.hxx @@ -16,12 +16,12 @@ * 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_IDLC_INC_IDLC_ASTSTRUCT_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX +#ifndef INCLUDED_IDLC_INC_ASTSTRUCT_HXX +#define INCLUDED_IDLC_INC_ASTSTRUCT_HXX -#include <idlc/asttype.hxx> -#include <idlc/astscope.hxx> -#include "idlc/idlctypes.hxx" +#include <asttype.hxx> +#include <astscope.hxx> +#include "idlctypes.hxx" class AstStruct; @@ -53,6 +53,6 @@ private: DeclList m_typeParameters; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTSTRUCT_HXX +#endif // INCLUDED_IDLC_INC_ASTSTRUCT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/aststructinstance.hxx b/idlc/inc/aststructinstance.hxx index 706d6cb1c0db..877fcd249ed1 100644 --- a/idlc/inc/idlc/aststructinstance.hxx +++ b/idlc/inc/aststructinstance.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_IDLC_INC_IDLC_ASTSTRUCTINSTANCE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTSTRUCTINSTANCE_HXX +#ifndef INCLUDED_IDLC_INC_ASTSTRUCTINSTANCE_HXX +#define INCLUDED_IDLC_INC_ASTSTRUCTINSTANCE_HXX -#include "idlc/asttype.hxx" -#include "idlc/idlctypes.hxx" +#include "asttype.hxx" +#include "idlctypes.hxx" class AstScope; diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/asttype.hxx index caecefda4f09..67f8d4d075ee 100644 --- a/idlc/inc/idlc/asttype.hxx +++ b/idlc/inc/asttype.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTTYPE_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX +#ifndef INCLUDED_IDLC_INC_ASTTYPE_HXX +#define INCLUDED_IDLC_INC_ASTTYPE_HXX -#include <idlc/astdeclaration.hxx> +#include <astdeclaration.hxx> class AstType : public AstDeclaration { @@ -33,6 +33,6 @@ public: virtual bool isUnsigned() const { return false; } }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTTYPE_HXX +#endif // INCLUDED_IDLC_INC_ASTTYPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/asttypedef.hxx index d31b7d62fc6f..2f9017200592 100644 --- a/idlc/inc/idlc/asttypedef.hxx +++ b/idlc/inc/asttypedef.hxx @@ -16,10 +16,10 @@ * 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_IDLC_INC_IDLC_ASTTYPEDEF_HXX -#define INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX +#ifndef INCLUDED_IDLC_INC_ASTTYPEDEF_HXX +#define INCLUDED_IDLC_INC_ASTTYPEDEF_HXX -#include <idlc/asttype.hxx> +#include <asttype.hxx> class AstTypeDef : public AstType { @@ -41,6 +41,6 @@ private: AstType const * m_pBaseType; }; -#endif // INCLUDED_IDLC_INC_IDLC_ASTTYPEDEF_HXX +#endif // INCLUDED_IDLC_INC_ASTTYPEDEF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/errorhandler.hxx index 7f7fd614fc43..8770cc93ac61 100644 --- a/idlc/inc/idlc/errorhandler.hxx +++ b/idlc/inc/errorhandler.hxx @@ -16,12 +16,12 @@ * 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_IDLC_INC_IDLC_ERRORHANDLER_HXX -#define INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX +#ifndef INCLUDED_IDLC_INC_ERRORHANDLER_HXX +#define INCLUDED_IDLC_INC_ERRORHANDLER_HXX -#include <idlc/astdeclaration.hxx> -#include <idlc/astexpression.hxx> -#include <idlc/astenum.hxx> +#include <astdeclaration.hxx> +#include <astexpression.hxx> +#include <astenum.hxx> enum ErrorCode { @@ -127,6 +127,6 @@ public: static bool checkPublished(AstDeclaration const * decl, bool bOptional=false); }; -#endif // INCLUDED_IDLC_INC_IDLC_ERRORHANDLER_HXX +#endif // INCLUDED_IDLC_INC_ERRORHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/fehelper.hxx index 1af64561a128..61bc51638dad 100644 --- a/idlc/inc/idlc/fehelper.hxx +++ b/idlc/inc/fehelper.hxx @@ -16,11 +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_IDLC_INC_IDLC_FEHELPER_HXX -#define INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX +#ifndef INCLUDED_IDLC_INC_FEHELPER_HXX +#define INCLUDED_IDLC_INC_FEHELPER_HXX -#include <idlc/asttype.hxx> -#include <idlc/astinterface.hxx> +#include <asttype.hxx> +#include <astinterface.hxx> #include <vector> @@ -71,6 +71,6 @@ private: std::vector< OString > m_typeParameters; }; -#endif // INCLUDED_IDLC_INC_IDLC_FEHELPER_HXX +#endif // INCLUDED_IDLC_INC_FEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc.hxx index 7d92c7f9493e..56fda18c9386 100644 --- a/idlc/inc/idlc/idlc.hxx +++ b/idlc/inc/idlc.hxx @@ -16,12 +16,12 @@ * 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_IDLC_INC_IDLC_IDLC_HXX -#define INCLUDED_IDLC_INC_IDLC_IDLC_HXX +#ifndef INCLUDED_IDLC_INC_IDLC_HXX +#define INCLUDED_IDLC_INC_IDLC_HXX -#include <idlc/idlctypes.hxx> -#include <idlc/aststack.hxx> -#include <idlc/options.hxx> +#include <idlctypes.hxx> +#include <aststack.hxx> +#include <options.hxx> #ifdef SAL_UNX #define SEPARATOR '/' @@ -161,6 +161,6 @@ AstDeclaration const * deconstructAndResolveTypedefs( AstInterface const * resolveInterfaceTypedefs(AstType const * type); -#endif // INCLUDED_IDLC_INC_IDLC_IDLC_HXX +#endif // INCLUDED_IDLC_INC_IDLC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlctypes.hxx index bbea0ba45cf0..36903ce8f7e6 100644 --- a/idlc/inc/idlc/idlctypes.hxx +++ b/idlc/inc/idlctypes.hxx @@ -16,8 +16,8 @@ * 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_IDLC_INC_IDLC_IDLCTYPES_HXX -#define INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX +#ifndef INCLUDED_IDLC_INC_IDLCTYPES_HXX +#define INCLUDED_IDLC_INC_IDLCTYPES_HXX #include <stdio.h> @@ -204,6 +204,6 @@ enum ParseState PS_DeclsDeclSeen // Seen complete decl in decls list }; -#endif // INCLUDED_IDLC_INC_IDLC_IDLCTYPES_HXX +#endif // INCLUDED_IDLC_INC_IDLCTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/inheritedinterface.hxx index afe0c99b9207..10e6ace39342 100644 --- a/idlc/inc/idlc/inheritedinterface.hxx +++ b/idlc/inc/inheritedinterface.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_IDLC_INC_IDLC_INHERITEDINTERFACE_HXX -#define INCLUDED_IDLC_INC_IDLC_INHERITEDINTERFACE_HXX +#ifndef INCLUDED_IDLC_INC_INHERITEDINTERFACE_HXX +#define INCLUDED_IDLC_INC_INHERITEDINTERFACE_HXX -#include "idlc/idlc.hxx" +#include "idlc.hxx" #include <rtl/ustring.hxx> diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/options.hxx index 2f4c02dcd404..3fbfc4586d1f 100644 --- a/idlc/inc/idlc/options.hxx +++ b/idlc/inc/options.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX -#define INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX +#ifndef INCLUDED_IDLC_INC_OPTIONS_HXX +#define INCLUDED_IDLC_INC_OPTIONS_HXX -#include <idlc/idlctypes.hxx> +#include <idlctypes.hxx> typedef std::unordered_map< OString, OString, @@ -78,6 +78,6 @@ protected: OptionMap m_options; }; -#endif // INCLUDED_IDLC_INC_IDLC_OPTIONS_HXX +#endif // INCLUDED_IDLC_INC_OPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx index ce38dcbfa461..54d235fa32ed 100644 --- a/idlc/source/astconstant.cxx +++ b/idlc/source/astconstant.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astconstant.hxx> -#include <idlc/astscope.hxx> +#include <astconstant.hxx> +#include <astscope.hxx> #include <registry/writer.hxx> diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx index fa889f96ab33..064cc324480c 100644 --- a/idlc/source/astdeclaration.cxx +++ b/idlc/source/astdeclaration.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astdeclaration.hxx> -#include <idlc/astscope.hxx> +#include <astdeclaration.hxx> +#include <astscope.hxx> #include <rtl/strbuf.hxx> #include <osl/diagnose.h> diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index c8a87ec77bbc..9c84e54218ea 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -17,17 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astmodule.hxx> -#include <idlc/asttypedef.hxx> -#include <idlc/astservice.hxx> -#include <idlc/astconstant.hxx> -#include <idlc/astattribute.hxx> -#include <idlc/astinterfacemember.hxx> -#include <idlc/astservicemember.hxx> -#include <idlc/astobserves.hxx> -#include <idlc/astneeds.hxx> -#include <idlc/astsequence.hxx> -#include "idlc/astoperation.hxx" +#include <astmodule.hxx> +#include <asttypedef.hxx> +#include <astservice.hxx> +#include <astconstant.hxx> +#include <astattribute.hxx> +#include <astinterfacemember.hxx> +#include <astservicemember.hxx> +#include <astobserves.hxx> +#include <astneeds.hxx> +#include <astsequence.hxx> +#include "astoperation.hxx" #include <osl/diagnose.h> diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx index cb2a4572b3b1..f3a20fce50b8 100644 --- a/idlc/source/astenum.cxx +++ b/idlc/source/astenum.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astenum.hxx> +#include <astenum.hxx> #include <registry/version.h> #include <registry/writer.hxx> diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 2ffd67fd3a27..4e583b35e43c 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -18,10 +18,10 @@ */ -#include <idlc/astexpression.hxx> -#include <idlc/astconstant.hxx> -#include <idlc/astscope.hxx> -#include <idlc/errorhandler.hxx> +#include <astexpression.hxx> +#include <astconstant.hxx> +#include <astscope.hxx> +#include <errorhandler.hxx> #include <osl/diagnose.h> diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx index e1336fb0a3f5..8add687cc0be 100644 --- a/idlc/source/astinterface.cxx +++ b/idlc/source/astinterface.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astinterface.hxx> -#include <idlc/astattribute.hxx> -#include <idlc/astoperation.hxx> -#include "idlc/idlc.hxx" +#include <astinterface.hxx> +#include <astattribute.hxx> +#include <astoperation.hxx> +#include "idlc.hxx" #include <registry/version.h> #include <registry/writer.hxx> diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx index 921a3e5365b1..78c4e452a915 100644 --- a/idlc/source/astoperation.cxx +++ b/idlc/source/astoperation.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astoperation.hxx> -#include <idlc/asttype.hxx> -#include <idlc/astbasetype.hxx> -#include <idlc/astparameter.hxx> -#include <idlc/errorhandler.hxx> +#include <astoperation.hxx> +#include <asttype.hxx> +#include <astbasetype.hxx> +#include <astparameter.hxx> +#include <errorhandler.hxx> #include <registry/writer.hxx> diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx index 23b62fa45675..7c064bd9dc3b 100644 --- a/idlc/source/astscope.cxx +++ b/idlc/source/astscope.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/astscope.hxx> -#include <idlc/astbasetype.hxx> -#include <idlc/astinterface.hxx> -#include <idlc/errorhandler.hxx> +#include <astscope.hxx> +#include <astbasetype.hxx> +#include <astinterface.hxx> +#include <errorhandler.hxx> #include <osl/diagnose.h> diff --git a/idlc/source/astservice.cxx b/idlc/source/astservice.cxx index 794a527d9fea..83cb3fbd35c9 100644 --- a/idlc/source/astservice.cxx +++ b/idlc/source/astservice.cxx @@ -20,10 +20,10 @@ #include <sal/config.h> -#include "idlc/astmember.hxx" -#include "idlc/astoperation.hxx" -#include "idlc/astservice.hxx" -#include "idlc/asttype.hxx" +#include "astmember.hxx" +#include "astoperation.hxx" +#include "astservice.hxx" +#include "asttype.hxx" bool AstService::checkLastConstructor() const { AstOperation const * last = static_cast< AstOperation const * >(getLast()); diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx index 83fed47377eb..1eaddbaabb42 100644 --- a/idlc/source/aststack.cxx +++ b/idlc/source/aststack.cxx @@ -18,8 +18,8 @@ */ #include <rtl/alloc.h> -#include <idlc/aststack.hxx> -#include <idlc/astscope.hxx> +#include <aststack.hxx> +#include <astscope.hxx> #define STACKSIZE_INCREMENT 64 diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx index 2fb9d6ffc869..5245f06c90f8 100644 --- a/idlc/source/aststruct.cxx +++ b/idlc/source/aststruct.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/aststruct.hxx> -#include <idlc/astmember.hxx> +#include <aststruct.hxx> +#include <astmember.hxx> #include <registry/version.h> #include <registry/writer.hxx> diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx index 3c5bb6740c34..0c18d7273901 100644 --- a/idlc/source/aststructinstance.cxx +++ b/idlc/source/aststructinstance.cxx @@ -18,10 +18,10 @@ */ -#include "idlc/aststructinstance.hxx" +#include "aststructinstance.hxx" -#include "idlc/asttype.hxx" -#include "idlc/idlctypes.hxx" +#include "asttype.hxx" +#include "idlctypes.hxx" #include <rtl/strbuf.hxx> #include <rtl/string.hxx> diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx index 5ed259f46a37..ed8f0cbd0801 100644 --- a/idlc/source/errorhandler.cxx +++ b/idlc/source/errorhandler.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/errorhandler.hxx> -#include <idlc/astinterface.hxx> +#include <errorhandler.hxx> +#include <astinterface.hxx> static const sal_Char* errorCodeToMessage(ErrorCode eCode) { diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx index 704c9539c2a1..47cb63af32bd 100644 --- a/idlc/source/fehelper.cxx +++ b/idlc/source/fehelper.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/fehelper.hxx> -#include <idlc/errorhandler.hxx> -#include "idlc/idlc.hxx" +#include <fehelper.hxx> +#include <errorhandler.hxx> +#include "idlc.hxx" FeDeclarator::FeDeclarator(const OString& name) : m_name(name) diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx index 97fe49a2a1bc..74e4c35dd457 100644 --- a/idlc/source/idlc.cxx +++ b/idlc/source/idlc.cxx @@ -17,22 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/idlc.hxx> -#include <idlc/errorhandler.hxx> -#include <idlc/astscope.hxx> -#include <idlc/astmodule.hxx> -#include <idlc/astservice.hxx> -#include <idlc/astconstants.hxx> -#include <idlc/astexception.hxx> -#include <idlc/astenum.hxx> -#include <idlc/astinterface.hxx> -#include <idlc/astoperation.hxx> -#include <idlc/astbasetype.hxx> -#include "idlc/astdeclaration.hxx" -#include "idlc/astparameter.hxx" -#include "idlc/astsequence.hxx" -#include "idlc/asttype.hxx" -#include "idlc/asttypedef.hxx" +#include <idlc.hxx> +#include <errorhandler.hxx> +#include <astscope.hxx> +#include <astmodule.hxx> +#include <astservice.hxx> +#include <astconstants.hxx> +#include <astexception.hxx> +#include <astenum.hxx> +#include <astinterface.hxx> +#include <astoperation.hxx> +#include <astbasetype.hxx> +#include "astdeclaration.hxx" +#include "astparameter.hxx" +#include "astsequence.hxx" +#include "asttype.hxx" +#include "asttypedef.hxx" #include <osl/diagnose.h> #include <osl/file.hxx> diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 26431583bf29..1cc5fac9005d 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/idlc.hxx> +#include <idlc.hxx> #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> #include <osl/process.h> diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx index 616a3aa135bf..d610246dcc46 100644 --- a/idlc/source/idlcmain.cxx +++ b/idlc/source/idlcmain.cxx @@ -18,7 +18,7 @@ */ -#include "idlc/idlc.hxx" +#include "idlc.hxx" #include <sal/main.h> #include <string.h> diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx index fba3d6bbe0af..1588dd312154 100644 --- a/idlc/source/idlcproduce.cxx +++ b/idlc/source/idlcproduce.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <idlc/idlc.hxx> -#include <idlc/astmodule.hxx> +#include <idlc.hxx> +#include <astmodule.hxx> #include <rtl/strbuf.hxx> #include <osl/file.hxx> #include <osl/thread.h> diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index 23de54ad0728..9a3eee6daf47 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -18,7 +18,7 @@ */ -#include "idlc/options.hxx" +#include "options.hxx" #include <osl/diagnose.h> #include <rtl/string.hxx> diff --git a/idlc/source/parser.y b/idlc/source/parser.y index edd636cdd776..c0459163ed80 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -24,27 +24,27 @@ %{ #include <string.h> -#include <idlc/idlc.hxx> -#include <idlc/errorhandler.hxx> -#include <idlc/fehelper.hxx> -#include <idlc/astexpression.hxx> -#include <idlc/astconstants.hxx> -#include <idlc/astconstant.hxx> -#include <idlc/astbasetype.hxx> -#include <idlc/asttypedef.hxx> -#include <idlc/astexception.hxx> -#include <idlc/astmember.hxx> -#include <idlc/astenum.hxx> -#include <idlc/astsequence.hxx> -#include <idlc/astattribute.hxx> -#include <idlc/astoperation.hxx> -#include <idlc/astparameter.hxx> -#include <idlc/astinterfacemember.hxx> -#include <idlc/astservicemember.hxx> -#include <idlc/astobserves.hxx> -#include <idlc/astneeds.hxx> - -#include "idlc/aststructinstance.hxx" +#include <idlc.hxx> +#include <errorhandler.hxx> +#include <fehelper.hxx> +#include <astexpression.hxx> +#include <astconstants.hxx> +#include <astconstant.hxx> +#include <astbasetype.hxx> +#include <asttypedef.hxx> +#include <astexception.hxx> +#include <astmember.hxx> +#include <astenum.hxx> +#include <astsequence.hxx> +#include <astattribute.hxx> +#include <astoperation.hxx> +#include <astparameter.hxx> +#include <astinterfacemember.hxx> +#include <astservicemember.hxx> +#include <astobserves.hxx> +#include <astneeds.hxx> + +#include "aststructinstance.hxx" #include "attributeexceptions.hxx" diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index 16ee27a93fe4..f1484bc0bab9 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -29,9 +29,9 @@ #include <stdlib.h> #include <string.h> -#include <idlc/idlc.hxx> -#include <idlc/errorhandler.hxx> -#include <idlc/fehelper.hxx> +#include <idlc.hxx> +#include <errorhandler.hxx> +#include <fehelper.hxx> #include "attributeexceptions.hxx" diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno.hxx index 6e3a030b0790..eac255469a6b 100644 --- a/pyuno/inc/pyuno/pyuno.hxx +++ b/pyuno/inc/pyuno.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_PYUNO_INC_PYUNO_PYUNO_HXX -#define INCLUDED_PYUNO_INC_PYUNO_PYUNO_HXX +#ifndef INCLUDED_PYUNO_INC_PYUNO_HXX +#define INCLUDED_PYUNO_INC_PYUNO_HXX #ifndef Py_PYTHON_H #if defined _MSC_VER diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index ce5bca5e5402..ef16cfb1872e 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -20,7 +20,7 @@ #include <config_features.h> #include <config_folders.h> -#include <pyuno/pyuno.hxx> +#include <pyuno.hxx> #include <osl/process.h> #include <osl/file.hxx> diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 0452da7cef6f..834333e61e7d 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -46,7 +46,7 @@ typedef long Py_hash_t; # define Py_TPFLAGS_HAVE_SEQUENCE_IN 0 #endif -#include <pyuno/pyuno.hxx> +#include <pyuno.hxx> #include <unordered_map> #include <unordered_set> diff --git a/svgio/inc/pch/precompiled_svgio.hxx b/svgio/inc/pch/precompiled_svgio.hxx index 6f8ee9eb9f07..1fbc10a68688 100644 --- a/svgio/inc/pch/precompiled_svgio.hxx +++ b/svgio/inc/pch/precompiled_svgio.hxx @@ -56,11 +56,11 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <o3tl/cow_wrapper.hxx> -#include <svgio/svgreader/svgdocument.hxx> -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgpaint.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgtoken.hxx> -#include <svgio/svgreader/svgtools.hxx> +#include <svgdocument.hxx> +#include <svgnode.hxx> +#include <svgpaint.hxx> +#include <svgstyleattributes.hxx> +#include <svgtoken.hxx> +#include <svgtools.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svganode.hxx b/svgio/inc/svganode.hxx index d58224a120da..ac07032f7adf 100644 --- a/svgio/inc/svgio/svgreader/svganode.hxx +++ b/svgio/inc/svganode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGANODE_HXX +#define INCLUDED_SVGIO_INC_SVGANODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -53,6 +53,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGANODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgcharacternode.hxx index c1cbd8192594..1025617e5c27 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgcharacternode.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX +#define INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX -#include <svgio/svgreader/svgnode.hxx> +#include <svgnode.hxx> namespace drawinglayer { namespace primitive2d { class TextSimplePortionPrimitive2D; }} @@ -164,6 +164,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgcirclenode.hxx index 9acbe907cf38..99f661dc53d4 100644 --- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx +++ b/svgio/inc/svgcirclenode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGCIRCLENODE_HXX +#define INCLUDED_SVGIO_INC_SVGCIRCLENODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -68,6 +68,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGCIRCLENODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgclippathnode.hxx index 706d4bd84df2..9bd7504f8183 100644 --- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx +++ b/svgio/inc/svgclippathnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGCLIPPATHNODE_HXX +#define INCLUDED_SVGIO_INC_SVGCLIPPATHNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -63,6 +63,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGCLIPPATHNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgdocument.hxx index 5a4b63119d7b..687fc494c2c3 100644 --- a/svgio/inc/svgio/svgreader/svgdocument.hxx +++ b/svgio/inc/svgdocument.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX +#ifndef INCLUDED_SVGIO_INC_SVGDOCUMENT_HXX +#define INCLUDED_SVGIO_INC_SVGDOCUMENT_HXX -#include <svgio/svgreader/svgnode.hxx> +#include <svgnode.hxx> #include <unordered_map> namespace svgio @@ -78,6 +78,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX +#endif // INCLUDED_SVGIO_INC_SVGDOCUMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgdocumenthandler.hxx index bc1d10a27821..5069fdbd2eda 100644 --- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx +++ b/svgio/inc/svgdocumenthandler.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX +#ifndef INCLUDED_SVGIO_INC_SVGDOCUMENTHANDLER_HXX +#define INCLUDED_SVGIO_INC_SVGDOCUMENTHANDLER_HXX #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgdocument.hxx> #include <cppuhelper/implbase.hxx> namespace svgio { namespace svgreader { class SvgCharacterNode; }} @@ -63,6 +63,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX +#endif // INCLUDED_SVGIO_INC_SVGDOCUMENTHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgellipsenode.hxx index 040235c75af8..4e51cff871ec 100644 --- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx +++ b/svgio/inc/svgellipsenode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGELLIPSENODE_HXX +#define INCLUDED_SVGIO_INC_SVGELLIPSENODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -73,6 +73,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGELLIPSENODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svggnode.hxx index 8d9ad9dec53f..9eb4e022d3d9 100644 --- a/svgio/inc/svgio/svgreader/svggnode.hxx +++ b/svgio/inc/svggnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGGNODE_HXX +#define INCLUDED_SVGIO_INC_SVGGNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -54,6 +54,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGGNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svggradientnode.hxx index 43a9752c418b..5e2bea70317b 100644 --- a/svgio/inc/svgio/svgreader/svggradientnode.hxx +++ b/svgio/inc/svggradientnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGGRADIENTNODE_HXX +#define INCLUDED_SVGIO_INC_SVGGRADIENTNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx> namespace svgio @@ -125,6 +125,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGGRADIENTNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svggradientstopnode.hxx index 055b47b0e5cd..d25898e96c06 100644 --- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx +++ b/svgio/inc/svggradientstopnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGGRADIENTSTOPNODE_HXX +#define INCLUDED_SVGIO_INC_SVGGRADIENTSTOPNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -52,6 +52,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGGRADIENTSTOPNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx index c21a9f5eaf3e..f723d147ecf3 100644 --- a/svgio/inc/svgio/svgreader/svgimagenode.hxx +++ b/svgio/inc/svgimagenode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGIMAGENODE_HXX +#define INCLUDED_SVGIO_INC_SVGIMAGENODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -84,6 +84,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGIMAGENODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svglinenode.hxx index 23e20bd3088e..336c2cd4ca80 100644 --- a/svgio/inc/svgio/svgreader/svglinenode.hxx +++ b/svgio/inc/svglinenode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGLINENODE_HXX +#define INCLUDED_SVGIO_INC_SVGLINENODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -73,6 +73,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGLINENODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgmarkernode.hxx index f0cca96096ce..aa61806f1a10 100644 --- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx +++ b/svgio/inc/svgmarkernode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGMARKERNODE_HXX +#define INCLUDED_SVGIO_INC_SVGMARKERNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -111,6 +111,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGMARKERNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgmasknode.hxx index 84c4bb1de38a..8e04fffc38f4 100644 --- a/svgio/inc/svgio/svgreader/svgmasknode.hxx +++ b/svgio/inc/svgmasknode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGMASKNODE_HXX +#define INCLUDED_SVGIO_INC_SVGMASKNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -88,6 +88,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGMASKNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgnode.hxx index 1b8359dde9b6..9df8419ad6f4 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgnode.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGNODE_HXX +#define INCLUDED_SVGIO_INC_SVGNODE_HXX -#include <svgio/svgreader/svgtools.hxx> -#include <svgio/svgreader/svgtoken.hxx> -#include <svgio/svgreader/svgpaint.hxx> +#include <svgtools.hxx> +#include <svgtoken.hxx> +#include <svgpaint.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <vector> @@ -185,6 +185,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgpaint.hxx b/svgio/inc/svgpaint.hxx index bab262adebdd..367f801260fa 100644 --- a/svgio/inc/svgio/svgreader/svgpaint.hxx +++ b/svgio/inc/svgpaint.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX +#ifndef INCLUDED_SVGIO_INC_SVGPAINT_HXX +#define INCLUDED_SVGIO_INC_SVGPAINT_HXX #include <basegfx/color/bcolor.hxx> @@ -53,6 +53,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX +#endif // INCLUDED_SVGIO_INC_SVGPAINT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgpathnode.hxx index 0c24244455fb..2cfa01ca21ab 100644 --- a/svgio/inc/svgio/svgreader/svgpathnode.hxx +++ b/svgio/inc/svgpathnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGPATHNODE_HXX +#define INCLUDED_SVGIO_INC_SVGPATHNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> namespace svgio @@ -65,6 +65,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGPATHNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgpatternnode.hxx index a5b6870ba8fe..cf8165996b8c 100644 --- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx +++ b/svgio/inc/svgpatternnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGPATTERNNODE_HXX +#define INCLUDED_SVGIO_INC_SVGPATTERNNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -114,6 +114,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGPATTERNNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgpolynode.hxx index 0e47c7499c2e..91340be62d46 100644 --- a/svgio/inc/svgio/svgreader/svgpolynode.hxx +++ b/svgio/inc/svgpolynode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGPOLYNODE_HXX +#define INCLUDED_SVGIO_INC_SVGPOLYNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> #include <basegfx/polygon/b2dpolygon.hxx> namespace svgio @@ -66,6 +66,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGPOLYNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgrectnode.hxx index f103876ab49a..a16f36949b73 100644 --- a/svgio/inc/svgio/svgreader/svgrectnode.hxx +++ b/svgio/inc/svgrectnode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGRECTNODE_HXX +#define INCLUDED_SVGIO_INC_SVGRECTNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -83,6 +83,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGRECTNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx index 141218b3e042..ea9c6c26f4a4 100644 --- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx +++ b/svgio/inc/svgstyleattributes.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX +#ifndef INCLUDED_SVGIO_INC_SVGSTYLEATTRIBUTES_HXX +#define INCLUDED_SVGIO_INC_SVGSTYLEATTRIBUTES_HXX -#include <svgio/svgreader/svgpaint.hxx> -#include <svgio/svgreader/svgnode.hxx> +#include <svgpaint.hxx> +#include <svgnode.hxx> #include <vcl/vclenum.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> @@ -473,6 +473,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX +#endif // INCLUDED_SVGIO_INC_SVGSTYLEATTRIBUTES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgstylenode.hxx index 8ee7fceec3c2..86809e23f394 100644 --- a/svgio/inc/svgio/svgreader/svgstylenode.hxx +++ b/svgio/inc/svgstylenode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGSTYLENODE_HXX +#define INCLUDED_SVGIO_INC_SVGSTYLENODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -59,6 +59,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGSTYLENODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgsvgnode.hxx index 15d49505bc4c..a256971b8719 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgsvgnode.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGSVGNODE_HXX +#define INCLUDED_SVGIO_INC_SVGSVGNODE_HXX -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -99,6 +99,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGSVGNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgsymbolnode.hxx index 6fb3d6e8d7b4..1ec961673ada 100644 --- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx +++ b/svgio/inc/svgsymbolnode.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX +#define INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -54,6 +54,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgtextnode.hxx index 86c13216d1f5..bea1fde1c328 100644 --- a/svgio/inc/svgio/svgreader/svgtextnode.hxx +++ b/svgio/inc/svgtextnode.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTEXTNODE_HXX +#define INCLUDED_SVGIO_INC_SVGTEXTNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgcharacternode.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> +#include <svgcharacternode.hxx> namespace svgio { @@ -70,6 +70,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGTEXTNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgtextpathnode.hxx index c0e4242ed27d..33c0e0a87d03 100644 --- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx +++ b/svgio/inc/svgtextpathnode.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTEXTPATHNODE_HXX +#define INCLUDED_SVGIO_INC_SVGTEXTPATHNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgpathnode.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> +#include <svgpathnode.hxx> namespace svgio { @@ -72,6 +72,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGTEXTPATHNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx b/svgio/inc/svgtitledescnode.hxx index 26e737c24b1a..c58b694317af 100644 --- a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx +++ b/svgio/inc/svgtitledescnode.hxx @@ -16,10 +16,10 @@ * 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_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTITLEDESCNODE_HXX +#define INCLUDED_SVGIO_INC_SVGTITLEDESCNODE_HXX -#include <svgio/svgreader/svgnode.hxx> +#include <svgnode.hxx> namespace svgio @@ -49,6 +49,6 @@ namespace svgio } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGTITLEDESCNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgtoken.hxx index 112102f8b4cc..714e3807a910 100644 --- a/svgio/inc/svgio/svgreader/svgtoken.hxx +++ b/svgio/inc/svgtoken.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTOKEN_HXX +#define INCLUDED_SVGIO_INC_SVGTOKEN_HXX #include <rtl/ustring.hxx> @@ -191,6 +191,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX +#endif // INCLUDED_SVGIO_INC_SVGTOKEN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgtools.hxx index eccf3ac0df84..c00f0784c481 100644 --- a/svgio/inc/svgio/svgreader/svgtools.hxx +++ b/svgio/inc/svgtools.hxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTOOLS_HXX +#define INCLUDED_SVGIO_INC_SVGTOOLS_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <svgio/svgreader/svgpaint.hxx> +#include <svgpaint.hxx> #include <vector> namespace svgio @@ -228,6 +228,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX +#endif // INCLUDED_SVGIO_INC_SVGTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgtrefnode.hxx index 2440e88bf267..e372887e6496 100644 --- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx +++ b/svgio/inc/svgtrefnode.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTREFNODE_HXX +#define INCLUDED_SVGIO_INC_SVGTREFNODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgtextnode.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> +#include <svgtextnode.hxx> namespace svgio { @@ -53,6 +53,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGTREFNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgtspannode.hxx index fd906e04f8b3..1d982b15ef1b 100644 --- a/svgio/inc/svgio/svgreader/svgtspannode.hxx +++ b/svgio/inc/svgtspannode.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGTSPANNODE_HXX +#define INCLUDED_SVGIO_INC_SVGTSPANNODE_HXX -#include <svgio/svgreader/svgcharacternode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgtools.hxx> +#include <svgcharacternode.hxx> +#include <svgstyleattributes.hxx> +#include <svgtools.hxx> namespace svgio { @@ -54,6 +54,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGTSPANNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgusenode.hxx index d235747e5ff4..3807f6f121c2 100644 --- a/svgio/inc/svgio/svgreader/svgusenode.hxx +++ b/svgio/inc/svgusenode.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX -#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX +#ifndef INCLUDED_SVGIO_INC_SVGUSENODE_HXX +#define INCLUDED_SVGIO_INC_SVGUSENODE_HXX -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> namespace svgio { @@ -75,6 +75,6 @@ namespace svgio } // end of namespace svgreader } // end of namespace svgio -#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX +#endif // INCLUDED_SVGIO_INC_SVGUSENODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/source/svgreader/svganode.cxx b/svgio/source/svgreader/svganode.cxx index 70c53d5c0a6f..9efa57331c27 100644 --- a/svgio/source/svgreader/svganode.cxx +++ b/svgio/source/svgreader/svganode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svganode.hxx> +#include <svganode.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 29fd2561200c..1753f2dd4c6c 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgcharacternode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgcharacternode.hxx> +#include <svgstyleattributes.hxx> #include <drawinglayer/attribute/fontattribute.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx index 3ac0d0b93cf4..2bbbffb7d7f4 100644 --- a/svgio/source/svgreader/svgcirclenode.cxx +++ b/svgio/source/svgreader/svgcirclenode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgcirclenode.hxx> +#include <svgcirclenode.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index ada214bc8360..dc607c7e627e 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgclippathnode.hxx> +#include <svgclippathnode.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx index 28b69a1de8a8..227ad4ae40d6 100644 --- a/svgio/source/svgreader/svgdocument.cxx +++ b/svgio/source/svgreader/svgdocument.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgdocument.hxx> +#include <svgdocument.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index e53471d59839..977b54d3b03f 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -17,34 +17,34 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgdocumenthandler.hxx> -#include <svgio/svgreader/svgtoken.hxx> -#include <svgio/svgreader/svgsvgnode.hxx> -#include <svgio/svgreader/svggnode.hxx> -#include <svgio/svgreader/svganode.hxx> -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgpathnode.hxx> -#include <svgio/svgreader/svgrectnode.hxx> -#include <svgio/svgreader/svggradientnode.hxx> -#include <svgio/svgreader/svggradientstopnode.hxx> -#include <svgio/svgreader/svgsymbolnode.hxx> -#include <svgio/svgreader/svgusenode.hxx> -#include <svgio/svgreader/svgcirclenode.hxx> -#include <svgio/svgreader/svgellipsenode.hxx> -#include <svgio/svgreader/svglinenode.hxx> -#include <svgio/svgreader/svgpolynode.hxx> -#include <svgio/svgreader/svgtextnode.hxx> -#include <svgio/svgreader/svgcharacternode.hxx> -#include <svgio/svgreader/svgtspannode.hxx> -#include <svgio/svgreader/svgtrefnode.hxx> -#include <svgio/svgreader/svgtextpathnode.hxx> -#include <svgio/svgreader/svgstylenode.hxx> -#include <svgio/svgreader/svgimagenode.hxx> -#include <svgio/svgreader/svgclippathnode.hxx> -#include <svgio/svgreader/svgmasknode.hxx> -#include <svgio/svgreader/svgmarkernode.hxx> -#include <svgio/svgreader/svgpatternnode.hxx> -#include <svgio/svgreader/svgtitledescnode.hxx> +#include <svgdocumenthandler.hxx> +#include <svgtoken.hxx> +#include <svgsvgnode.hxx> +#include <svggnode.hxx> +#include <svganode.hxx> +#include <svgnode.hxx> +#include <svgpathnode.hxx> +#include <svgrectnode.hxx> +#include <svggradientnode.hxx> +#include <svggradientstopnode.hxx> +#include <svgsymbolnode.hxx> +#include <svgusenode.hxx> +#include <svgcirclenode.hxx> +#include <svgellipsenode.hxx> +#include <svglinenode.hxx> +#include <svgpolynode.hxx> +#include <svgtextnode.hxx> +#include <svgcharacternode.hxx> +#include <svgtspannode.hxx> +#include <svgtrefnode.hxx> +#include <svgtextpathnode.hxx> +#include <svgstylenode.hxx> +#include <svgimagenode.hxx> +#include <svgclippathnode.hxx> +#include <svgmasknode.hxx> +#include <svgmarkernode.hxx> +#include <svgpatternnode.hxx> +#include <svgtitledescnode.hxx> using namespace com::sun::star; diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx index 2f0b12df1565..9fab41512a1e 100644 --- a/svgio/source/svgreader/svgellipsenode.cxx +++ b/svgio/source/svgreader/svgellipsenode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgellipsenode.hxx> +#include <svgellipsenode.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx index 2f553786606d..c3ae8ca75c1e 100644 --- a/svgio/source/svgreader/svggnode.cxx +++ b/svgio/source/svgreader/svggnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svggnode.hxx> +#include <svggnode.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx index 6f2560dcfa50..8137ac3fe50d 100644 --- a/svgio/source/svgreader/svggradientnode.cxx +++ b/svgio/source/svgreader/svggradientnode.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svggradientnode.hxx> -#include <svgio/svgreader/svgdocument.hxx> -#include <svgio/svgreader/svggradientstopnode.hxx> +#include <svggradientnode.hxx> +#include <svgdocument.hxx> +#include <svggradientstopnode.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx index 506fd13ae4ff..f2f10d8019aa 100644 --- a/svgio/source/svgreader/svggradientstopnode.cxx +++ b/svgio/source/svgreader/svggradientstopnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svggradientstopnode.hxx> +#include <svggradientstopnode.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index 53cc5641d962..074f46ff31b7 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgimagenode.hxx> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgimagenode.hxx> +#include <svgdocument.hxx> #include <sax/tools/converter.hxx> #include <tools/stream.hxx> #include <vcl/bitmapex.hxx> diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx index b63fd8fa9768..2bbcadb14679 100644 --- a/svgio/source/svgreader/svglinenode.cxx +++ b/svgio/source/svgreader/svglinenode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svglinenode.hxx> +#include <svglinenode.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx index c0c2dc76ebcf..5c8ecd21a3e1 100644 --- a/svgio/source/svgreader/svgmarkernode.cxx +++ b/svgio/source/svgreader/svgmarkernode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgmarkernode.hxx> +#include <svgmarkernode.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index bf72eaca25d1..4879e7e7caff 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgmasknode.hxx> +#include <svgmasknode.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index c9bd15adbdf1..a3a77ab15b80 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -18,9 +18,9 @@ */ #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svgio/svgreader/svgdocument.hxx> -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgdocument.hxx> +#include <svgnode.hxx> +#include <svgstyleattributes.hxx> #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> #include <tools/urlobj.hxx> diff --git a/svgio/source/svgreader/svgpaint.cxx b/svgio/source/svgreader/svgpaint.cxx index e5aa257c14be..fdf44be8d812 100644 --- a/svgio/source/svgreader/svgpaint.cxx +++ b/svgio/source/svgreader/svgpaint.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgpaint.hxx> +#include <svgpaint.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx index 818a98c32034..9ba246997f86 100644 --- a/svgio/source/svgreader/svgpathnode.cxx +++ b/svgio/source/svgreader/svgpathnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgpathnode.hxx> +#include <svgpathnode.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> namespace svgio diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx index c99c4f112a69..6338f96fd1d6 100644 --- a/svgio/source/svgreader/svgpatternnode.cxx +++ b/svgio/source/svgreader/svgpatternnode.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgpatternnode.hxx> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgpatternnode.hxx> +#include <svgdocument.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx index fe9efd1c273b..378f4c74cc52 100644 --- a/svgio/source/svgreader/svgpolynode.cxx +++ b/svgio/source/svgreader/svgpolynode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgpolynode.hxx> +#include <svgpolynode.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx index 7b826362fdff..ee10be205fa9 100644 --- a/svgio/source/svgreader/svgrectnode.cxx +++ b/svgio/source/svgreader/svgrectnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgrectnode.hxx> +#include <svgrectnode.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index ff4a1853f2f7..db20d64902f8 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -17,24 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgstyleattributes.hxx> +#include <svgstyleattributes.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -#include <svgio/svgreader/svgnode.hxx> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgnode.hxx> +#include <svgdocument.hxx> #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx> -#include <svgio/svgreader/svggradientnode.hxx> +#include <svggradientnode.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <basegfx/vector/b2enums.hxx> #include <drawinglayer/processor2d/linegeometryextractor2d.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> -#include <svgio/svgreader/svgclippathnode.hxx> -#include <svgio/svgreader/svgmasknode.hxx> +#include <svgclippathnode.hxx> +#include <svgmasknode.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svgio/svgreader/svgmarkernode.hxx> +#include <svgmarkernode.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> -#include <svgio/svgreader/svgpatternnode.hxx> +#include <svgpatternnode.hxx> #include <drawinglayer/primitive2d/patternfillprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx index 61497fcde94a..08b3eafd7bcc 100644 --- a/svgio/source/svgreader/svgstylenode.cxx +++ b/svgio/source/svgreader/svgstylenode.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgstylenode.hxx> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgstylenode.hxx> +#include <svgdocument.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index 324ecf5a4b18..81dfd24b1ca5 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgsvgnode.hxx> +#include <svgsvgnode.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx index aec7baef1068..85f1ea5f5cb6 100644 --- a/svgio/source/svgreader/svgsymbolnode.cxx +++ b/svgio/source/svgreader/svgsymbolnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgsymbolnode.hxx> +#include <svgsymbolnode.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx index ae7d0e104b85..d78912901f86 100644 --- a/svgio/source/svgreader/svgtextnode.cxx +++ b/svgio/source/svgreader/svgtextnode.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtextnode.hxx> -#include <svgio/svgreader/svgcharacternode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgtrefnode.hxx> -#include <svgio/svgreader/svgtextpathnode.hxx> -#include <svgio/svgreader/svgtspannode.hxx> +#include <svgtextnode.hxx> +#include <svgcharacternode.hxx> +#include <svgstyleattributes.hxx> +#include <svgtrefnode.hxx> +#include <svgtextpathnode.hxx> +#include <svgtspannode.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index c4e7f426ecac..faeb257bb672 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtextpathnode.hxx> -#include <svgio/svgreader/svgstyleattributes.hxx> -#include <svgio/svgreader/svgpathnode.hxx> -#include <svgio/svgreader/svgdocument.hxx> -#include <svgio/svgreader/svgtrefnode.hxx> +#include <svgtextpathnode.hxx> +#include <svgstyleattributes.hxx> +#include <svgpathnode.hxx> +#include <svgdocument.hxx> +#include <svgtrefnode.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/textbreakuphelper.hxx> diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx index de34e2790c72..36b4cd48b250 100644 --- a/svgio/source/svgreader/svgtitledescnode.cxx +++ b/svgio/source/svgreader/svgtitledescnode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtitledescnode.hxx> +#include <svgtitledescnode.hxx> namespace svgio diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index bb9ac17e23cf..af1970b51e8a 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtoken.hxx> +#include <svgtoken.hxx> #include <unordered_map> namespace svgio diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index b3925c0e1dbb..3ef273fe4e36 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtools.hxx> +#include <svgtools.hxx> #include <osl/thread.h> #include <tools/color.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <svgio/svgreader/svgtoken.hxx> +#include <svgtoken.hxx> #include <unordered_map> namespace svgio diff --git a/svgio/source/svgreader/svgtrefnode.cxx b/svgio/source/svgreader/svgtrefnode.cxx index f698794e9e80..c9325e8a5c9c 100644 --- a/svgio/source/svgreader/svgtrefnode.cxx +++ b/svgio/source/svgreader/svgtrefnode.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtrefnode.hxx> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgtrefnode.hxx> +#include <svgdocument.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgtspannode.cxx b/svgio/source/svgreader/svgtspannode.cxx index 962f1c8f145d..96a85c156feb 100644 --- a/svgio/source/svgreader/svgtspannode.cxx +++ b/svgio/source/svgreader/svgtspannode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgtspannode.hxx> +#include <svgtspannode.hxx> namespace svgio { diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index 84f4bbe75785..6a055d0fdd22 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svgio/svgreader/svgusenode.hxx> +#include <svgusenode.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> -#include <svgio/svgreader/svgdocument.hxx> +#include <svgdocument.hxx> namespace svgio { diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 14f184f87b17..7f2bcac953de 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <svgio/svgreader/svgdocumenthandler.hxx> +#include <svgdocumenthandler.hxx> #include "xsvgparser.hxx" diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/options.hxx index 566c18d01f1c..3ba269fe8d14 100644 --- a/unodevtools/inc/unodevtools/options.hxx +++ b/unodevtools/inc/options.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX -#define INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX +#ifndef INCLUDED_UNODEVTOOLS_INC_OPTIONS_HXX +#define INCLUDED_UNODEVTOOLS_INC_OPTIONS_HXX #include "sal/config.h" @@ -37,6 +37,6 @@ bool readOption( const sal_Char * pOpt, } // end of namespace unodevtools -#endif // INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX +#endif // INCLUDED_UNODEVTOOLS_INC_OPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx index c193df6de267..6fd03a6a7951 100644 --- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx +++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx @@ -22,7 +22,7 @@ #include "codemaker/typemanager.hxx" #include "sal/main.h" #include "rtl/process.h" -#include "unodevtools/options.hxx" +#include "options.hxx" #include "unoidl/unoidl.hxx" #include "skeletonjava.hxx" diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index 6022e5c29669..596a2415c0e9 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -22,7 +22,7 @@ #include "codemaker/global.hxx" #include "rtl/ustring.hxx" #include "rtl/process.h" -#include "unodevtools/options.hxx" +#include "options.hxx" namespace unodevtools { diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/biginteger.hxx index 7b3cafa06648..73f6259c966b 100644 --- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx +++ b/xmlsecurity/inc/biginteger.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_BIGINTEGER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_BIGINTEGER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_BIGINTEGER_HXX +#define INCLUDED_XMLSECURITY_INC_BIGINTEGER_HXX #include <sal/config.h> #include <rtl/ustring.hxx> diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index e24c457bfc81..ec555b6724ee 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX +#define INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX #include <svtools/simptabl.hxx> #include <vcl/dialog.hxx> @@ -36,7 +36,7 @@ namespace xml { namespace crypto { }}} #include <com/sun/star/uno/Sequence.hxx> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> class HeaderBar; @@ -79,6 +79,6 @@ public: OUString UsageInClearText(int bits); }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX +#endif // INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index fa9e33f14f2b..c0072c5077ac 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX +#define INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -145,6 +145,6 @@ public: }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX +#endif // INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 83370dbb8c6d..4c3a13fe722e 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX +#ifndef INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX +#define INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> @@ -27,8 +27,8 @@ #include <svtools/stdctrl.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <xmlsecurity/documentsignaturehelper.hxx> -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> #include <documentsignaturemanager.hxx> #include <vector> @@ -124,6 +124,6 @@ public: bool SignaturesChanged() const { return mbSignaturesChanged; } }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX +#endif // INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx index 9ccbd3aff792..4767e585629a 100644 --- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx +++ b/xmlsecurity/inc/documentsignaturehelper.hxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX +#define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> -#include "xmlsecurity/sigstruct.hxx" +#include "sigstruct.hxx" #include "xmlsecuritydllapi.h" #include <vector> @@ -97,6 +97,6 @@ public: }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX +#endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx index 361de61e3bec..a3881052fb88 100644 --- a/xmlsecurity/inc/documentsignaturemanager.hxx +++ b/xmlsecurity/inc/documentsignaturemanager.hxx @@ -21,11 +21,11 @@ #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX #include "xmlsecuritydllapi.h" -#include <xmlsecurity/sigstruct.hxx> -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <sigstruct.hxx> +#include <xmlsignaturehelper.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> #include <com/sun/star/beans/PropertyValue.hpp> /// Manages signatures (addition, removal), used by DigitalSignaturesDialog. @@ -61,6 +61,6 @@ public: void write(); }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREMANAGER_HXX +#endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/global.hrc index 0b4b0ac7a58a..00dfdd33cc58 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/global.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_GLOBAL_HRC -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_GLOBAL_HRC +#ifndef INCLUDED_XMLSECURITY_INC_GLOBAL_HRC +#define INCLUDED_XMLSECURITY_INC_GLOBAL_HRC // global resource ids diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 4c6d5f37c4a5..fb308d5a6b97 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX +#ifndef INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX +#define INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX #include <vcl/fixed.hxx> #include <vcl/button.hxx> @@ -147,6 +147,6 @@ public: }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX +#endif // INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 3c566596ea91..dde0b196af29 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -17,7 +17,7 @@ ./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts */ #include <algorithm> @@ -304,6 +304,6 @@ #include <unotools/readwritemutexguard.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx index 8ea24be36a43..fbfaea7b1566 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx @@ -17,7 +17,7 @@ ./bin/update_pch xmlsecurity xsec_fw --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_fw.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./inc/pch/precompiled_xsec_fw.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts */ #include <cassert> diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 089c2192c4ff..aee27c5fee2f 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -17,7 +17,7 @@ ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts */ #include <cassert> @@ -114,7 +114,7 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <xmloff/dllapi.h> -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> // Cleanup windows header macro pollution. #if defined(_WIN32) && defined(WINAPI) diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/sigstruct.hxx index 5a7df3dedd76..8650a8f84ac2 100644 --- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx +++ b/xmlsecurity/inc/sigstruct.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_SIGSTRUCT_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_SIGSTRUCT_HXX +#ifndef INCLUDED_XMLSECURITY_INC_SIGSTRUCT_HXX +#define INCLUDED_XMLSECURITY_INC_SIGSTRUCT_HXX #include <rtl/ustring.hxx> #include <com/sun/star/util/DateTime.hpp> diff --git a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index 9d20cedd6b4a..3d5c24b9b6f1 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H +#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H +#define INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H #include <sal/config.h> diff --git a/xmlsecurity/inc/xmlsecuritydllapi.h b/xmlsecurity/inc/xmlsecuritydllapi.h index f0540c799b48..2349d239b862 100644 --- a/xmlsecurity/inc/xmlsecuritydllapi.h +++ b/xmlsecurity/inc/xmlsecuritydllapi.h @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H -#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H +#ifndef INCLUDED_XMLSECURITY_INCDLLAPI_H +#define INCLUDED_XMLSECURITY_INCDLLAPI_H #include <sal/types.h> @@ -18,6 +18,6 @@ #define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H +#endif // INCLUDED_XMLSECURITY_INCDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 869d66bbab6d..4118b6304b42 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX -#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX +#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX +#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX #include <vector> #include <tools/link.hxx> #include <rtl/ustring.hxx> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> #include <xmlsecuritydllapi.h> #include <com/sun/star/uno/XComponentContext.hpp> @@ -193,6 +193,6 @@ public: void ExportSignatureContentTypes(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount); }; -#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX +#endif // INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index d2a9f1741f34..767b0fa33a77 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -38,8 +38,8 @@ #include <osl/file.hxx> #include <comphelper/ofopxmlhelper.hxx> -#include <xmlsecurity/documentsignaturehelper.hxx> -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> #include <documentsignaturemanager.hxx> using namespace com::sun::star; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index f510f9c9ec30..476da3da7d1c 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -18,12 +18,12 @@ */ #include "documentdigitalsignatures.hxx" -#include <xmlsecurity/digitalsignaturesdialog.hxx> -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/macrosecurity.hxx> -#include <xmlsecurity/biginteger.hxx> -#include <xmlsecurity/global.hrc> +#include <digitalsignaturesdialog.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <macrosecurity.hxx> +#include <biginteger.hxx> +#include <global.hrc> #include <sax/tools/converter.hxx> diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index 3bc155b4657f..7ab640570e2d 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> namespace com { namespace sun { namespace star { diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src index 7202fe958f23..38f090ce6f6c 100644 --- a/xmlsecurity/source/component/warnbox.src +++ b/xmlsecurity/source/component/warnbox.src @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/global.hrc> +#include <global.hrc> String RID_XMLSECWB_NO_MOZILLA_PROFILE { diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 70fe823254ca..ce92dfd4a0e5 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -18,9 +18,9 @@ */ -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <biginteger.hxx> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 9c4e39767f87..3749160a5078 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/security/CertificateCharacters.hpp> diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index 65cceb6085d2..ce7e97c14118 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -21,7 +21,7 @@ #define INCLUDED_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC #include <svtools/controldims.hrc> -#include <xmlsecurity/global.hrc> +#include <global.hrc> #define STD_MASKCOLOR Color{Red=0xffff;Green=0x0000;Blue=0xffff;} diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index f79296fb5d32..91bf1c33de0a 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/digitalsignaturesdialog.hxx> -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <digitalsignaturesdialog.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <biginteger.hxx> #include <sax/tools/converter.hxx> #include <com/sun/star/embed/XStorage.hpp> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc index 51dee1c5aa8b..25aa5cc6a6ea 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_DIGITALSIGNATURESDIALOG_HRC #define INCLUDED_DIGITALSIGNATURESDIALOG_HRC -//global.hrc in xmlsecurity/inc starts at 1000 +//global.hrc in inc starts at 1000 #define RID_DIGITALSIGNATUREDLG_START 2000 #define STR_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 0eaefdf75c22..9d7950e36d1a 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -18,10 +18,10 @@ */ -#include <xmlsecurity/macrosecurity.hxx> -#include <xmlsecurity/certificatechooser.hxx> -#include <xmlsecurity/certificateviewer.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <macrosecurity.hxx> +#include <certificatechooser.hxx> +#include <certificateviewer.hxx> +#include <biginteger.hxx> #include <osl/file.hxx> #include <vcl/help.hxx> diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 30dbede00a1f..d50a4fc497f6 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -18,7 +18,7 @@ */ -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> #include <algorithm> diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.hxx b/xmlsecurity/source/helper/ooxmlsecexporter.hxx index 3b3d04eadb27..1a96430bba9a 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.hxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.hxx @@ -15,7 +15,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> /// Writes a single OOXML digital signature. class OOXMLSecExporter diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index e7e8e05cdb06..b1d155449b13 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -18,8 +18,8 @@ */ -#include <xmlsecurity/xmlsignaturehelper.hxx> -#include <xmlsecurity/documentsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> +#include <documentsignaturehelper.hxx> #include "xsecctl.hxx" #include "xmlsignaturehelper2.hxx" diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index a850a83fbc60..772b7cd56a5b 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmlsecurity/xmlsignaturehelper.hxx> +#include <xmlsignaturehelper.hxx> #include "xmlsignaturehelper2.hxx" #include <tools/solar.h> diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 4f124a2dc07e..4d02bce95dd5 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECCTL_HXX #define INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECCTL_HXX -#include <xmlsecurity/sigstruct.hxx> +#include <sigstruct.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/XParser.hpp> diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index 3c33ea8a36b0..5b7075c47e47 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -18,9 +18,9 @@ */ -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include <com/sun/star/uno/Sequence.hxx> using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index 14e4863bc2a9..d1b25b6e6dbc 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -23,7 +23,7 @@ */ #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::xml::crypto; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 84fd8e80848c..30295452e2d2 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -38,10 +38,10 @@ #include "x509certificate_mscryptimpl.hxx" #include <comphelper/servicehelper.hxx> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include "xmlsec/mscrypto/akmngr.h" -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> #include <comphelper/windowserrorstring.hxx> #include <sal/log.hxx> diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index ddb812bc5292..62df6b7fa85b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -45,7 +45,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <list> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include <sal/types.h> diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index 985dc2cdc149..f0c262b96db1 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -22,7 +22,7 @@ #include "securityenvironment_mscryptimpl.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include "xmlsec/mscrypto/app.h" #include <com/sun/star/xml/crypto/SecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XMLSecurityContext.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index c9cbc7295c86..0ff4c0ba891f 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -28,7 +28,7 @@ #include "securityenvironment_mscryptimpl.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #ifdef UNX #define stricmp strcasecmp diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index 21dd902b0cfc..8615671ed291 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -23,7 +23,7 @@ #include "xmlsecuritycontext_mscryptimpl.hxx" #include "xmlstreamio.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include "xmlsec/mscrypto/akmngr.h" using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index e350282a3afd..a23af537a925 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -27,7 +27,7 @@ #include "securityenvironment_mscryptimpl.hxx" #include "xmlstreamio.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 47f609bb144d..a0db87690f78 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -29,12 +29,12 @@ #include "x509certificate_nssimpl.hxx" #include <comphelper/servicehelper.hxx> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/docpasswordrequest.hxx> -#include <xmlsecurity/biginteger.hxx> +#include <biginteger.hxx> #include <sal/log.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include <vector> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 58b91ffc2749..38ebdf031e44 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -43,7 +43,7 @@ #include "certdb.h" #include "list" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment , diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index bc4ae4720612..8aa9e014d3bd 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -28,7 +28,7 @@ #include "securityenvironment_nssimpl.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 8cf0f94e429f..8e51babf6a08 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -24,7 +24,7 @@ #include "xmlsecuritycontext_nssimpl.hxx" #include "xmlstreamio.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 21c78d578b22..1cdd52066a4f 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -31,7 +31,7 @@ #include "xmlstreamio.hxx" #include "errorcallback.hxx" -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx index 5b484224405a..1772671c8ff2 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -31,7 +31,7 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> -#include "xmlsecurity/biginteger.hxx" +#include "biginteger.hxx" #include "serialnumberadapter.hxx" diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 2370bd6bd7e1..2d2bb236460b 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -26,7 +26,7 @@ #include <rtl/uri.hxx> #include <libxml/uri.h> -#include "xmlsecurity/xmlsec-wrapper.h" +#include "xmlsec-wrapper.h" #define XMLSTREAMIO_INITIALIZED 0x01 #define XMLSTREAMIO_REGISTERED 0x02 |