summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/app/mn.src53
-rw-r--r--sw/source/ui/inc/swmn.hrc379
-rw-r--r--sw/source/ui/uiview/pview.cxx5
-rw-r--r--sw/source/ui/uiview/srcview.cxx7
-rw-r--r--sw/source/ui/uiview/view0.cxx5
-rw-r--r--sw/source/ui/vba/service.cxx15
-rw-r--r--sw/source/ui/web/web.src5
-rw-r--r--sw/source/ui/web/wview.cxx5
8 files changed, 24 insertions, 450 deletions
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f5283e49b173..8c02caec033b 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -35,7 +35,6 @@
/* --------------------- F O R M A T --------------------------------- */
-<<<<<<< local
#define SEPARATOR MenuItem { Separator = TRUE; }
//define for ITEM_FORMAT_NUMBERING
@@ -54,7 +53,7 @@
MenuItem\
{\
Identifier = FN_FORMAT_PAGE_DLG ; \
- HelpID = FN_FORMAT_PAGE_DLG ; \
+ HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
Text [ en-US ] = "Pa~ge..." ; \
};
@@ -71,7 +70,6 @@
MenuItem\
{\
Identifier = MN_FORMAT_STYLE ; \
- HelpID = MN_FORMAT_STYLE ; \
Command = ".uno:StyleMenu" ; \
Text [ en-US ] = "St~yle" ; \
SubMenu = Menu\
@@ -110,13 +108,13 @@
MenuItem\
{\
Identifier = FN_SET_SUPER_SCRIPT ; \
- HelpID = FN_SET_SUPER_SCRIPT ; \
+ HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
Text [ en-US ] = "Superscript" ; \
};\
MenuItem\
{\
Identifier = FN_SET_SUB_SCRIPT ; \
- HelpID = FN_SET_SUB_SCRIPT ; \
+ HelpId = CMD_FN_SET_SUB_SCRIPT ; \
Text [ en-US ] = "Subscript" ; \
};\
};\
@@ -125,10 +123,8 @@
MenuItem\
{\
Identifier = MN_FORMAT_ALGN ; \
- HelpID = MN_FORMAT_ALGN ; \
Command = ".uno:AlignTextMenu" ; \
Text [ en-US ] = "A~lignment" ; \
- RadioCheck = TRUE ; \
SubMenu = Menu\
{\
ItemList = \
@@ -151,7 +147,7 @@
MenuItem\
{\
Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
- HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \
+ HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
RadioCheck = TRUE ; \
Text [ en-US ] = "Justified" ; \
};\
@@ -161,7 +157,6 @@
MenuItem\
{\
Identifier = MN_FORMAT_LINESPACE ; \
- HelpID = MN_FORMAT_LINESPACE ; \
Command = ".uno:LineSpacingMenu" ; \
Text [ en-US ] = "Line Spacing" ; \
_MenuItemFlags = MIB_RADIOCHECK ; \
@@ -206,21 +201,21 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \
{ \
Identifier = FN_EDIT_FIELD ; \
- HelpID = FN_EDIT_FIELD ; \
+ HelpId = CMD_FN_EDIT_FIELD ; \
Text [ en-US ] = "Fields..." ; \
};
#define _MN_EDIT_FOOTNOTE \
MenuItem \
{ \
Identifier = FN_EDIT_FOOTNOTE ; \
- HelpID = FN_EDIT_FOOTNOTE ; \
+ HelpId = CMD_FN_EDIT_FOOTNOTE ; \
Text [ en-US ] = "Footnote/Endnote~..." ; \
};
#define _MN_EDIT_IDX_ENTRY_DLG \
MenuItem \
{ \
Identifier = FN_EDIT_IDX_ENTRY_DLG ; \
- HelpID = FN_EDIT_IDX_ENTRY_DLG ; \
+ HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ; \
Text [ en-US ] = "Inde~x Entry..." ; \
};
@@ -228,13 +223,13 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \
{ \
Identifier = FN_REDLINE_ACCEPT_DIRECT; \
- HelpID = FN_REDLINE_ACCEPT_DIRECT ; \
+ HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \
Text [ en-US ] = "Accept Change" ; \
};\
MenuItem \
{ \
Identifier = FN_REDLINE_REJECT_DIRECT ; \
- HelpID = FN_REDLINE_REJECT_DIRECT ; \
+ HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \
Text [ en-US ] = "Reject Change" ; \
}; \
SEPARATOR ;
@@ -242,7 +237,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \
{ \
Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \
- HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \
+ HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ; \
Text [ en-US ] = "~Bibliography Entry..."; \
}; \
SEPARATOR ;
@@ -255,19 +250,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \
{ \
Identifier = FN_EDIT_HYPERLINK ; \
- HelpID = FN_EDIT_HYPERLINK ; \
+ HelpId = CMD_FN_EDIT_HYPERLINK ; \
Text [ en-US ] = "Edit Hyperlink..."; \
}; \
MenuItem \
{ \
Identifier = FN_COPY_HYPERLINK_LOCATION; \
- HelpID = FN_COPY_HYPERLINK_LOCATION; \
+ HelpId = CMD_FN_COPY_HYPERLINK_LOCATION; \
Text [ en-US ] = "Copy Hyperlink ~Location"; \
}; \
MenuItem \
{ \
Identifier = FN_REMOVE_HYPERLINK ; \
- HelpID = FN_REMOVE_HYPERLINK ; \
+ HelpId = CMD_FN_REMOVE_HYPERLINK ; \
Text [ en-US ] = "Remo~ve Hyperlink"; \
};
@@ -281,7 +276,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem\
{\
Identifier = FN_EDIT_HYPERLINK ; \
- HelpID = FN_EDIT_HYPERLINK ; \
+ HelpId = CMD_FN_EDIT_HYPERLINK ; \
Text [ en-US ] = "~Edit Hyperlink" ; \
};
@@ -304,7 +299,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem\
{\
Identifier = FN_FORMAT_RESET ; \
- HelpID = FN_FORMAT_RESET ; \
+ HelpId = CMD_FN_FORMAT_RESET ; \
Text [ en-US ] = "~Default Formatting" ; \
};
@@ -313,25 +308,25 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \
{ \
Identifier = FN_NUMBER_NEWSTART; \
- HelpId = FN_NUMBER_NEWSTART; \
+ HelpId = CMD_FN_NUMBER_NEWSTART; \
Text[ en-US ] = "Restart Numbering"; \
}; \
MenuItem \
{ \
Identifier = FN_NUM_CONTINUE; \
- HelpId = FN_NUM_CONTINUE; \
+ HelpId = CMD_FN_NUM_CONTINUE; \
Text[ en-US ] = "Continue previous numbering"; \
}; \
MenuItem \
{ \
Identifier = FN_NUM_BULLET_UP; \
- HelpId = FN_NUM_BULLET_UP; \
+ HelpId = CMD_FN_NUM_BULLET_UP; \
Text[ en-US ] = "Up One Level"; \
}; \
MenuItem \
{ \
Identifier = FN_NUM_BULLET_DOWN; \
- HelpId = FN_NUM_BULLET_DOWN; \
+ HelpId = CMD_FN_NUM_BULLET_DOWN; \
Text[ en-US ] = "Down One Level"; \
};
@@ -354,19 +349,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \
{ \
Identifier = FN_UPDATE_CUR_TOX ; \
- HelpID = FN_UPDATE_CUR_TOX ; \
+ HelpId = CMD_FN_UPDATE_CUR_TOX ; \
Text [ en-US ] = "~Update Index/Table"; \
}; \
MenuItem \
{ \
Identifier = FN_EDIT_CURRENT_TOX; \
- HelpID = FN_EDIT_CURRENT_TOX; \
+ HelpId = CMD_FN_EDIT_CURRENT_TOX; \
Text [ en-US ] = "~Edit Index/Table"; \
}; \
MenuItem \
{ \
Identifier = FN_REMOVE_CUR_TOX; \
- HelpID = FN_REMOVE_CUR_TOX; \
+ HelpId = CMD_FN_REMOVE_CUR_TOX; \
Text [ en-US ] = "Delete Index/Table"; \
}; \
SEPARATOR ;
@@ -375,10 +370,6 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
_DEFAULT_TEXT_EDIT_ELEMENTS \
}; \
};
-=======
-#include "swmn.hrc"
-#include "helpid.h"
->>>>>>> other
/*------------------------------------------------------------------------
Beschreibung: Menu Window
diff --git a/sw/source/ui/inc/swmn.hrc b/sw/source/ui/inc/swmn.hrc
deleted file mode 100644
index 0d5b3265e79a..000000000000
--- a/sw/source/ui/inc/swmn.hrc
+++ /dev/null
@@ -1,379 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SWMN_HRC
-#define _SWMN_HRC
-
-#include <svx/dialogs.hrc>
-#include <svx/globlmn.hrc>
-#include "cmdid.h"
-#include "app.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-#include "popup.hrc"
-//#include "cfgid.h"
-
-/* --------------------- F O R M A T --------------------------------- */
-
-#define SEPARATOR MenuItem { Separator = TRUE; }
-
-//define for ITEM_FORMAT_NUMBERING
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS
-#define MN_NUMBERING ITEM_FORMAT_NUMBERING
-
-#define MN_TXT\
- MenuItem\
- {\
- ITEM_FORMAT_CHAR_DLG\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_PARA_DLG\
- };\
- MenuItem\
- {\
- Identifier = FN_FORMAT_PAGE_DLG ; \
- HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
- Text [ en-US ] = "Pa~ge..." ; \
- };
-
-
-#define MN_TEXT_ATTR\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_FONT\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\
- };\
- MenuItem\
- {\
- Identifier = MN_FORMAT_STYLE ; \
- Command = ".uno:StyleMenu" ; \
- Text [ en-US ] = "St~yle" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_WEIGHT\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_POSTURE\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_OVERLINE\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_UNDERLINE\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_SHADOWED\
- };\
- MenuItem\
- {\
- ITEM_FORMAT_ATTR_CHAR_CONTOUR\
- };\
- SEPARATOR ; \
- MenuItem\
- {\
- Identifier = FN_SET_SUPER_SCRIPT ; \
- HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
- Text [ en-US ] = "Superscript" ; \
- };\
- MenuItem\
- {\
- Identifier = FN_SET_SUB_SCRIPT ; \
- HelpId = CMD_FN_SET_SUB_SCRIPT ; \
- Text [ en-US ] = "Subscript" ; \
- };\
- };\
- };\
- };\
- MenuItem\
- {\
- Identifier = MN_FORMAT_ALGN ; \
- Command = ".uno:AlignTextMenu" ; \
- Text [ en-US ] = "A~lignment" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\
- };\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\
- };\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\
- };\
- MenuItem\
- {\
- Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
- HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "Justified" ; \
- };\
- };\
- };\
- };\
- MenuItem\
- {\
- Identifier = MN_FORMAT_LINESPACE ; \
- Command = ".uno:LineSpacingMenu" ; \
- Text [ en-US ] = "Line Spacing" ; \
- _MenuItemFlags = MIB_RADIOCHECK ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_PARA_LINESPACE_10\
- };\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_PARA_LINESPACE_15\
- };\
- MenuItem\
- {\
- RadioCheck = TRUE ; \
- ITEM_FORMAT_PARA_LINESPACE_20\
- };\
- };\
- };\
- };
-
-/* --------------------- M E N U --------------------------------- */
-
-/*
-
-
-The application menu bar resource has become obsolete. You can now find the menu bar at the following
-location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
-
-
-*/
-
-/* --------------------- D O C U M E N T -------------------------- */
-
-
-#define _MN_EDIT_FIELD \
- MenuItem \
- { \
- Identifier = FN_EDIT_FIELD ; \
- HelpId = CMD_FN_EDIT_FIELD ; \
- Text [ en-US ] = "Fields..." ; \
- };
-#define _MN_EDIT_FOOTNOTE \
- MenuItem \
- { \
- Identifier = FN_EDIT_FOOTNOTE ; \
- HelpId = CMD_FN_EDIT_FOOTNOTE ; \
- Text [ en-US ] = "Footnote/Endnote~..." ; \
- };
- #define _MN_EDIT_IDX_ENTRY_DLG \
- MenuItem \
- { \
- Identifier = FN_EDIT_IDX_ENTRY_DLG ; \
- HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ; \
- Text [ en-US ] = "Inde~x Entry..." ; \
- };
-
-#define _MN_EDIT_REDLINE \
- MenuItem \
- { \
- Identifier = FN_REDLINE_ACCEPT_DIRECT; \
- HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \
- Text [ en-US ] = "Accept Change" ; \
- };\
- MenuItem \
- { \
- Identifier = FN_REDLINE_REJECT_DIRECT ; \
- HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \
- Text [ en-US ] = "Reject Change" ; \
- }; \
- SEPARATOR ;
-#define _MN_EDIT_BIB_ENTRY_DLG \
- MenuItem \
- { \
- Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \
- HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ; \
- Text [ en-US ] = "~Bibliography Entry..."; \
- }; \
- SEPARATOR ;
-
-#define _MN_EDIT_OPEN_HYPERLINK \
- MenuItem \
- { \
- ITEM_OPEN_HYPERLINK \
- };\
- MenuItem \
- { \
- Identifier = FN_EDIT_HYPERLINK ; \
- HelpId = CMD_FN_EDIT_HYPERLINK ; \
- Text [ en-US ] = "Edit Hyperlink..."; \
- }; \
- MenuItem \
- { \
- Identifier = FN_COPY_HYPERLINK_LOCATION; \
- HelpId = CMD_FN_COPY_HYPERLINK_LOCATION; \
- Text [ en-US ] = "Copy Hyperlink ~Location"; \
- }; \
- MenuItem \
- { \
- Identifier = FN_REMOVE_HYPERLINK ; \
- HelpId = CMD_FN_REMOVE_HYPERLINK ; \
- Text [ en-US ] = "Remo~ve Hyperlink"; \
- };
-
-#define _MN_EDIT_OPEN_SMARTTAGMENU \
- MenuItem \
- { \
- ITEM_OPEN_SMARTTAGMENU \
- };
-
-#define _MN_EDIT__HYPERLINK \
- MenuItem\
- {\
- Identifier = FN_EDIT_HYPERLINK ; \
- HelpId = CMD_FN_EDIT_HYPERLINK ; \
- Text [ en-US ] = "~Edit Hyperlink" ; \
- };
-
-#define _DEFAULT_TEXT_EDIT_ELEMENTS \
- _MN_EDIT_FIELD \
- _MN_EDIT_FOOTNOTE \
- _MN_EDIT_IDX_ENTRY_DLG \
- _MN_EDIT_BIB_ENTRY_DLG \
- _MN_EDIT_REDLINE \
- MenuItem \
- { \
- ITEM_POPUP_TEMPLATE_EDIT \
- }; \
- SEPARATOR ; \
- _MN_EDIT_OPEN_HYPERLINK \
- _MN_EDIT_OPEN_SMARTTAGMENU
-
-
-#define MN_RESET\
- MenuItem\
- {\
- Identifier = FN_FORMAT_RESET ; \
- HelpId = CMD_FN_FORMAT_RESET ; \
- Text [ en-US ] = "~Default Formatting" ; \
- };
-
-#define _NUMBERING_RELATED_MENU \
- SEPARATOR ; \
- MenuItem \
- { \
- Identifier = FN_NUMBER_NEWSTART; \
- HelpId = CMD_FN_NUMBER_NEWSTART; \
- Text[ en-US ] = "Restart Numbering"; \
- }; \
- MenuItem \
- { \
- Identifier = FN_NUM_CONTINUE; \
- HelpId = CMD_FN_NUM_CONTINUE; \
- Text[ en-US ] = "Continue previous numbering"; \
- }; \
- MenuItem \
- { \
- Identifier = FN_NUM_BULLET_UP; \
- HelpId = CMD_FN_NUM_BULLET_UP; \
- Text[ en-US ] = "Up One Level"; \
- }; \
- MenuItem \
- { \
- Identifier = FN_NUM_BULLET_DOWN; \
- HelpId = CMD_FN_NUM_BULLET_DOWN; \
- Text[ en-US ] = "Down One Level"; \
- };
-
-#define BASE_TEXT_POPUPMENU_BEGIN \
-{ \
- ItemList = \
- { \
- MN_RESET \
- _NUMBERING_RELATED_MENU \
- SEPARATOR ; \
- MN_TEXT_ATTR \
- SEPARATOR ; \
- MN_TXT \
- MN_NUMBERING \
- ITEM_TRANSLITERATE_MENU \
- SEPARATOR ;
-
-// not in Writer/Web
-#define BASE_TEXT_POPUPMENU_NOWEB \
- MenuItem \
- { \
- Identifier = FN_UPDATE_CUR_TOX ; \
- HelpId = CMD_FN_UPDATE_CUR_TOX ; \
- Text [ en-US ] = "~Update Index/Table"; \
- }; \
- MenuItem \
- { \
- Identifier = FN_EDIT_CURRENT_TOX; \
- HelpId = CMD_FN_EDIT_CURRENT_TOX; \
- Text [ en-US ] = "~Edit Index/Table"; \
- }; \
- MenuItem \
- { \
- Identifier = FN_REMOVE_CUR_TOX; \
- HelpId = CMD_FN_REMOVE_CUR_TOX; \
- Text [ en-US ] = "Delete Index/Table"; \
- }; \
- SEPARATOR ;
-
-#define BASE_TEXT_POPUPMENU_END \
- _DEFAULT_TEXT_EDIT_ELEMENTS \
- }; \
-};
-
-#endif
-
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 9a2b729ae89b..d7bdc34409a4 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -107,12 +107,7 @@
using namespace ::com::sun::star;
-
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY(SwPagePreView)
-=======
SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview")
->>>>>>> other
{
SFX_VIEW_REGISTRATION(SwDocShell);
SFX_VIEW_REGISTRATION(SwWebDocShell);
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 9143e59d76f3..af7e12629a73 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -125,18 +125,11 @@ using ::com::sun::star::util::SearchOptions;
#define BMARGPRN 1000
#define BORDERPRN 300
-
-
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY(SwSrcView)
-=======
SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
->>>>>>> other
{
SFX_VIEW_REGISTRATION(SwWebDocShell);
}
-
SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index fbe59d286eec..84000c3ae049 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -104,12 +104,7 @@ using ::rtl::OUString;
#include <unomid.h>
-
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY(SwView)
-=======
SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
->>>>>>> other
{
if ( SvtModuleOptions().IsWriter() )
{
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 957bb38d428c..bff007751562 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -66,21 +66,7 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-<<<<<<< local
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
- {
- OSL_TRACE("In component_writeInfo");
-
- // Component registration
- return component_writeInfoHelper( pServiceManager, pRegistryKey,
- globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl );
- }
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
-=======
- void * SAL_CALL component_getFactory(
->>>>>>> other
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
@@ -91,3 +77,4 @@ extern "C"
return pRet;
}
}
+
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 1de9453e1fc7..9907982a6bca 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -79,8 +79,5 @@ String RID_WEBOLE_TOOLBOX
{
Text [ en-US ] = "Object/Web" ;
};
-<<<<<<< local
-=======
-/*************************************************************************
->>>>>>> other
+
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index a45f9b3b22c0..d1e7fe672a38 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -93,16 +93,11 @@
#include <swslots.hxx>
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY(SwWebView)
-=======
SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")
->>>>>>> other
{
SFX_VIEW_REGISTRATION(SwWebDocShell);
}
-
SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
{
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
generated by cgit (git 2.34.1) at 2025-05-01 16:02:31 +0000