mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS gnumake2: resolve conflicts and make sources buildable on Linux

Browse Source
This commit is contained in:
Mathias Bauer
2010-10-29 15:36:30 +02:00
parent 0fe045d956
commit 5eb9ea76e2
15 changed files with 32 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
starmath/source/smres.src
View File

@@ -1743,77 +1743,6 @@ String RID_ERR_RIGHTEXPECTED
Text [ en-US ] = "'RIGHT' expected" ; Text [ en-US ] = "'RIGHT' expected" ;
}; };
<<<<<<< local
ToolBox RID_MATH_TOOLBOX
{
HelpId = RID_MATH_TOOLBOX ;
Customize = TRUE ;
LineSpacing = TRUE ;
Dockable = TRUE ;
Moveable = TRUE ;
Sizeable = TRUE ;
Closeable = TRUE ;
Zoomable = TRUE ;
Scroll = TRUE ;
HideWhenDeactivate = TRUE ;
Border = TRUE ;
SVLook = TRUE ;
Align = BOXALIGN_LEFT ;
Size = MAP_APPFONT ( 0 , 0 ) ;
MenuStrings = TRUE ;
ItemList =
{
ToolBoxItem
{
Identifier = SID_ZOOMIN ;
HelpID = SID_ZOOMIN ;
Text [ en-US ] = "Zoom In" ;
};
ToolBoxItem
{
Identifier = SID_ZOOMOUT ;
HelpID = SID_ZOOMOUT ;
Text [ en-US ] = "Zoom Out" ;
};
ToolBoxItem
{
Identifier = SID_VIEW100 ;
HelpID = SID_VIEW100 ;
Text [ en-US ] = "Zoom 100%" ;
};
ToolBoxItem
{
Identifier = SID_ADJUST ;
HelpID = SID_ADJUST ;
Text [ en-US ] = "Entire Formula" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
Identifier = SID_DRAW ;
HelpID = SID_DRAW ;
Text [ en-US ] = "Refresh" ;
};
ToolBoxItem
{
Identifier = SID_FORMULACURSOR ;
HelpID = SID_FORMULACURSOR ;
Text [ en-US ] = "Formula Cursor";
};
ToolBoxItem
{
Identifier = SID_SYMBOLS_CATALOGUE ;
HelpID = SID_SYMBOLS_CATALOGUE ;
Text [ en-US ] = "Symbols" ;
};
};
};
=======
>>>>>>> other
String RID_MATH_TOOLBOX String RID_MATH_TOOLBOX
{ {
Text [ en-US ] = "Main Toolbar" ; Text [ en-US ] = "Main Toolbar" ;
@@ -1838,9 +1767,6 @@ StringArray RID_PRINTUIOPTIONS
< "Adjusts the formula to the page format used in the printout."; >; < "Adjusts the formula to the page format used in the printout."; >;
< "~Scaling"; >; < "~Scaling"; >;
< "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >; < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >;
// < "Miscellaneous options"; >;
// < "Ig~nore ~~ and ` at the end of the line"; >;
// < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
}; };
}; };

8
starmath/source/view.cxx
View File

@@ -738,10 +738,6 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD |
SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
SmResId(RID_MATH_TOOLBOX )); SmResId(RID_MATH_TOOLBOX ));
//Dummy-Objectbar, damit es bei aktivieren nicht staendig zuppelt.
// Wegen #58705# entfernt (RID wurde nirgends verwendet)
// SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_SERVER,
// SmResId(RID_DRAW_OBJECTBAR) );
SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId());
@@ -749,11 +745,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
} }
<<<<<<< local
SFX_IMPL_VIEWFACTORY(SmViewShell)
=======
SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default") SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default")
>>>>>>> other
{ {
SFX_VIEW_REGISTRATION(SmDocShell); SFX_VIEW_REGISTRATION(SmDocShell);
} }

1
sw/AllLangResTarget_sw.mk
View File

@@ -153,7 +153,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/misc/insrule.src \ sw/source/ui/misc/insrule.src \
sw/source/ui/misc/autocorr.src \ sw/source/ui/misc/autocorr.src \
sw/source/ui/ribbar/tbxanchr.src \ sw/source/ui/ribbar/tbxanchr.src \
sw/source/ui/ribbar/tblctrl.src \
sw/source/ui/ribbar/workctrl.src \ sw/source/ui/ribbar/workctrl.src \
sw/source/ui/ribbar/inputwin.src \ sw/source/ui/ribbar/inputwin.src \
sw/source/ui/shells/shells.src \ sw/source/ui/shells/shells.src \

1
sw/Library_sw.mk
View File

@@ -676,7 +676,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/uno/RefreshListenerContainer \ sw/source/ui/uno/RefreshListenerContainer \
sw/source/ui/uno/SwXDocumentSettings \ sw/source/ui/uno/SwXDocumentSettings \
sw/source/ui/uno/SwXFilterOptions \ sw/source/ui/uno/SwXFilterOptions \
sw/source/ui/uno/SwXPrintPreviewSettings \
sw/source/ui/uno/dlelstnr \ sw/source/ui/uno/dlelstnr \
sw/source/ui/uno/unoatxt \ sw/source/ui/uno/unoatxt \
sw/source/ui/uno/unodefaults \ sw/source/ui/uno/unodefaults \

1
sw/Library_vbaswobj.mk
View File

@@ -79,6 +79,7 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
sw/source/ui/vba/vbaautotextentry \ sw/source/ui/vba/vbaautotextentry \
sw/source/ui/vba/vbarange \ sw/source/ui/vba/vbarange \
sw/source/ui/vba/vbadocumentproperties \ sw/source/ui/vba/vbadocumentproperties \
sw/source/ui/vba/vbaeventshelper \
sw/source/ui/vba/vbastyle \ sw/source/ui/vba/vbastyle \
sw/source/ui/vba/vbapane \ sw/source/ui/vba/vbapane \
sw/source/ui/vba/vbaglobals \ sw/source/ui/vba/vbaglobals \

4
sw/inc/pch/precompiled_sw.hxx
View File

@@ -920,12 +920,8 @@
#include "vcl/group.hxx" #include "vcl/group.hxx"
#include "vcl/help.hxx" #include "vcl/help.hxx"
#include "vcl/image.hxx" #include "vcl/image.hxx"
<<<<<<< local
#include "vcl/button.hxx" #include "vcl/button.hxx"
#include "vcl/imgcons.hxx" #include "vcl/imgcons.hxx"
=======
#include "vcl/imagebtn.hxx"
>>>>>>> other
#include "vcl/inputctx.hxx" #include "vcl/inputctx.hxx"
#include "vcl/jobset.hxx" #include "vcl/jobset.hxx"
#include "vcl/keycod.hxx" #include "vcl/keycod.hxx"

91
sw/prj/build.lst
View File

@@ -1,89 +1,12 @@
<<<<<<< local
sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL
sw sw usr1 - all sw_mkout NULL sw sw usr1 - all sw_mkout NULL
sw sw\prj nmake - all sw_prj NULL sw sw\prj nmake - all sw_prj NULL
=======
sw sw : filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL
sw sw usr1 - all sw_mkout NULL
sw sw\inc nmake - all sw_inc NULL
sw sw\uiconfig\layout nmake - all sw_layout NULL
sw sw\prj get - all sw_prj NULL
sw sw\source\ui\inc nmake - all sw_uinc NULL
sw sw\source\core\inc get - all sw_cinc NULL
sw sw\source\filter\inc get - all sw_finc NULL
sw sw\res get - all sw_res NULL
sw sw\win\res get - all sw_wres NULL
sw sw\win\imglst get - all sw_wimg NULL
sw sw\sdi nmake - all sw_sdi NULL
sw sw\source\core\bastyp nmake - all sw_bast sw_inc NULL
sw sw\source\ui\app nmake - all sw_app sw_sdi sw_uinc sw_inc NULL
sw sw\source\ui\cctrl nmake - all sw_cctrl sw_inc NULL
sw sw\source\ui\chrdlg nmake - all sw_chrdl sw_inc NULL
sw sw\source\ui\config nmake - all sw_conf sw_inc NULL
sw sw\source\ui\dbui nmake - all sw_dbui sw_inc NULL
sw sw\source\ui\dialog nmake - all sw_dlg sw_inc NULL
sw sw\source\ui\dochdl nmake - all sw_dchdl sw_inc NULL
sw sw\source\ui\docvw nmake - all sw_dcvw sw_inc NULL
sw sw\source\ui\envelp nmake - all sw_envlp sw_inc NULL
sw sw\source\ui\fldui nmake - all sw_fldui sw_inc NULL
sw sw\source\ui\fmtui nmake - all sw_fmtui sw_inc NULL
sw sw\source\ui\frmdlg nmake - all sw_frmdl sw_inc NULL
sw sw\source\ui\globdoc nmake - all sw_globd sw_uinc sw_inc NULL
sw sw\source\ui\index nmake - all sw_index sw_inc NULL
sw sw\source\ui\lingu nmake - all sw_ling sw_inc NULL
sw sw\source\ui\misc nmake - all sw_misc sw_sdi sw_inc NULL
sw sw\source\ui\ribbar nmake - all sw_rbbar sw_inc NULL
sw sw\source\ui\shells nmake - all sw_shell sw_uinc sw_sdi sw_inc NULL
sw sw\source\ui\smartmenu nmake - all sw_smartmenu sw_inc NULL
sw sw\source\ui\table nmake - all sw_table sw_inc NULL
sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL
sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL
sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL
sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL
sw sw\source\ui\web nmake - all sw_web sw_uinc sw_sdi sw_inc NULL
sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL
sw sw\source\core\attr nmake - all sw_attr sw_inc NULL
sw sw\source\core\crsr nmake - all sw_crsr sw_inc NULL
sw sw\source\core\doc nmake - all sw_doc sw_inc NULL
sw sw\source\core\docnode nmake - all sw_dcnd sw_inc NULL
sw sw\source\core\draw nmake - all sw_draw sw_inc NULL
sw sw\source\core\edit nmake - all sw_edit sw_inc NULL
sw sw\source\core\except nmake - all sw_excpt sw_inc NULL
sw sw\source\core\fields nmake - all sw_fld sw_inc NULL
sw sw\source\core\frmedt nmake - all sw_frmed sw_inc NULL
sw sw\source\core\graphic nmake - all sw_grph sw_inc NULL
sw sw\source\core\layout nmake - all sw_layo sw_inc NULL
sw sw\source\core\ole nmake - all sw_ole sw_inc NULL
sw sw\source\core\para nmake - all sw_para sw_inc NULL
sw sw\source\core\sw3io nmake - all sw_sw3io sw_inc NULL
sw sw\source\core\swg nmake - all sw_swg sw_inc NULL
sw sw\source\core\text nmake - all sw_text sw_inc NULL
sw sw\source\core\tox nmake - all sw_tox sw_inc NULL
sw sw\source\core\txtnode nmake - all sw_txtnd sw_inc NULL
sw sw\source\core\undo nmake - all sw_undo sw_inc NULL
sw sw\source\core\view nmake - all sw_view sw_inc NULL
sw sw\source\core\unocore nmake - all sw_uco sw_inc NULL
sw sw\source\core\objectpositioning nmake - all sw_objpos sw_inc NULL
sw sw\source\core\access nmake - all sw_acc sw_inc NULL
sw sw\source\core\SwNumberTree nmake - all sw_NumberTree sw_inc NULL
sw sw\source\core\table nmake - all sw_tablecore sw_inc NULL
sw sw\source\filter\ascii nmake - all sw_ascii sw_inc NULL
sw sw\source\filter\basflt nmake - all sw_bsflt sw_inc NULL
sw sw\source\filter\html nmake - all sw_html sw_inc NULL
sw sw\source\filter\rtf nmake - all sw_rtf sw_inc NULL
sw sw\source\filter\writer nmake - all sw_wrtr sw_inc NULL
sw sw\source\filter\ww1 nmake - all sw_ww1 sw_inc NULL
sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL
sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL
sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL
sw sw\qa\complex\accessibility nmake - all sw_qa_complex_accessibility sw_util NULL
sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_util NULL sw sw\qa\complex\accessibility nmake - all sw_qa_complex_accessibility sw_prj NULL
sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_prj NULL
# fails # fails
# sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_util NULL # sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_prj NULL
# sw sw\qa\complex\writer nmake - all sw_qa_complex_writer sw_util NULL # sw sw\qa\complex\writer nmake - all sw_qa_complex_writer sw_prj NULL
sw sw\qa\unoapi nmake - all sw_qa_unoapi sw_util NULL sw sw\qa\unoapi nmake - all sw_qa_unoapi sw_prj NULL
>>>>>>> other

53
sw/source/ui/app/mn.src
View File

@@ -35,7 +35,6 @@
/* --------------------- F O R M A T --------------------------------- */ /* --------------------- F O R M A T --------------------------------- */
<<<<<<< local
#define SEPARATOR MenuItem { Separator = TRUE; } #define SEPARATOR MenuItem { Separator = TRUE; }
//define for ITEM_FORMAT_NUMBERING //define for ITEM_FORMAT_NUMBERING
@@ -54,7 +53,7 @@
MenuItem\ MenuItem\
{\ {\
Identifier = FN_FORMAT_PAGE_DLG ; \ Identifier = FN_FORMAT_PAGE_DLG ; \
HelpID = FN_FORMAT_PAGE_DLG ; \ HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
Text [ en-US ] = "Pa~ge..." ; \ Text [ en-US ] = "Pa~ge..." ; \
}; };
@@ -71,7 +70,6 @@
MenuItem\ MenuItem\
{\ {\
Identifier = MN_FORMAT_STYLE ; \ Identifier = MN_FORMAT_STYLE ; \
HelpID = MN_FORMAT_STYLE ; \
Command = ".uno:StyleMenu" ; \ Command = ".uno:StyleMenu" ; \
Text [ en-US ] = "St~yle" ; \ Text [ en-US ] = "St~yle" ; \
SubMenu = Menu\ SubMenu = Menu\
@@ -110,13 +108,13 @@
MenuItem\ MenuItem\
{\ {\
Identifier = FN_SET_SUPER_SCRIPT ; \ Identifier = FN_SET_SUPER_SCRIPT ; \
HelpID = FN_SET_SUPER_SCRIPT ; \ HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
Text [ en-US ] = "Superscript" ; \ Text [ en-US ] = "Superscript" ; \
};\ };\
MenuItem\ MenuItem\
{\ {\
Identifier = FN_SET_SUB_SCRIPT ; \ Identifier = FN_SET_SUB_SCRIPT ; \
HelpID = FN_SET_SUB_SCRIPT ; \ HelpId = CMD_FN_SET_SUB_SCRIPT ; \
Text [ en-US ] = "Subscript" ; \ Text [ en-US ] = "Subscript" ; \
};\ };\
};\ };\
@@ -125,10 +123,8 @@
MenuItem\ MenuItem\
{\ {\
Identifier = MN_FORMAT_ALGN ; \ Identifier = MN_FORMAT_ALGN ; \
HelpID = MN_FORMAT_ALGN ; \
Command = ".uno:AlignTextMenu" ; \ Command = ".uno:AlignTextMenu" ; \
Text [ en-US ] = "A~lignment" ; \ Text [ en-US ] = "A~lignment" ; \
RadioCheck = TRUE ; \
SubMenu = Menu\ SubMenu = Menu\
{\ {\
ItemList = \ ItemList = \
@@ -151,7 +147,7 @@
MenuItem\ MenuItem\
{\ {\
Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
RadioCheck = TRUE ; \ RadioCheck = TRUE ; \
Text [ en-US ] = "Justified" ; \ Text [ en-US ] = "Justified" ; \
};\ };\
@@ -161,7 +157,6 @@
MenuItem\ MenuItem\
{\ {\
Identifier = MN_FORMAT_LINESPACE ; \ Identifier = MN_FORMAT_LINESPACE ; \
HelpID = MN_FORMAT_LINESPACE ; \
Command = ".uno:LineSpacingMenu" ; \ Command = ".uno:LineSpacingMenu" ; \
Text [ en-US ] = "Line Spacing" ; \ Text [ en-US ] = "Line Spacing" ; \
_MenuItemFlags = MIB_RADIOCHECK ; \ _MenuItemFlags = MIB_RADIOCHECK ; \
@@ -206,21 +201,21 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_EDIT_FIELD ; \ Identifier = FN_EDIT_FIELD ; \
HelpID = FN_EDIT_FIELD ; \ HelpId = CMD_FN_EDIT_FIELD ; \
Text [ en-US ] = "Fields..." ; \ Text [ en-US ] = "Fields..." ; \
}; };
#define _MN_EDIT_FOOTNOTE \ #define _MN_EDIT_FOOTNOTE \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_EDIT_FOOTNOTE ; \ Identifier = FN_EDIT_FOOTNOTE ; \
HelpID = FN_EDIT_FOOTNOTE ; \ HelpId = CMD_FN_EDIT_FOOTNOTE ; \
Text [ en-US ] = "Footnote/Endnote~..." ; \ Text [ en-US ] = "Footnote/Endnote~..." ; \
}; };
#define _MN_EDIT_IDX_ENTRY_DLG \ #define _MN_EDIT_IDX_ENTRY_DLG \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ 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..." ; \ Text [ en-US ] = "Inde~x Entry..." ; \
}; };
@@ -228,13 +223,13 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_REDLINE_ACCEPT_DIRECT; \ Identifier = FN_REDLINE_ACCEPT_DIRECT; \
HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \
Text [ en-US ] = "Accept Change" ; \ Text [ en-US ] = "Accept Change" ; \
};\ };\
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_REDLINE_REJECT_DIRECT ; \ Identifier = FN_REDLINE_REJECT_DIRECT ; \
HelpID = FN_REDLINE_REJECT_DIRECT ; \ HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \
Text [ en-US ] = "Reject Change" ; \ Text [ en-US ] = "Reject Change" ; \
}; \ }; \
SEPARATOR ; SEPARATOR ;
@@ -242,7 +237,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \
HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ; \
Text [ en-US ] = "~Bibliography Entry..."; \ Text [ en-US ] = "~Bibliography Entry..."; \
}; \ }; \
SEPARATOR ; SEPARATOR ;
@@ -255,19 +250,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_EDIT_HYPERLINK ; \ Identifier = FN_EDIT_HYPERLINK ; \
HelpID = FN_EDIT_HYPERLINK ; \ HelpId = CMD_FN_EDIT_HYPERLINK ; \
Text [ en-US ] = "Edit Hyperlink..."; \ Text [ en-US ] = "Edit Hyperlink..."; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_COPY_HYPERLINK_LOCATION; \ Identifier = FN_COPY_HYPERLINK_LOCATION; \
HelpID = FN_COPY_HYPERLINK_LOCATION; \ HelpId = CMD_FN_COPY_HYPERLINK_LOCATION; \
Text [ en-US ] = "Copy Hyperlink ~Location"; \ Text [ en-US ] = "Copy Hyperlink ~Location"; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_REMOVE_HYPERLINK ; \ Identifier = FN_REMOVE_HYPERLINK ; \
HelpID = FN_REMOVE_HYPERLINK ; \ HelpId = CMD_FN_REMOVE_HYPERLINK ; \
Text [ en-US ] = "Remo~ve Hyperlink"; \ Text [ en-US ] = "Remo~ve Hyperlink"; \
}; };
@@ -281,7 +276,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem\ MenuItem\
{\ {\
Identifier = FN_EDIT_HYPERLINK ; \ Identifier = FN_EDIT_HYPERLINK ; \
HelpID = FN_EDIT_HYPERLINK ; \ HelpId = CMD_FN_EDIT_HYPERLINK ; \
Text [ en-US ] = "~Edit Hyperlink" ; \ Text [ en-US ] = "~Edit Hyperlink" ; \
}; };
@@ -304,7 +299,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem\ MenuItem\
{\ {\
Identifier = FN_FORMAT_RESET ; \ Identifier = FN_FORMAT_RESET ; \
HelpID = FN_FORMAT_RESET ; \ HelpId = CMD_FN_FORMAT_RESET ; \
Text [ en-US ] = "~Default Formatting" ; \ Text [ en-US ] = "~Default Formatting" ; \
}; };
@@ -313,25 +308,25 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_NUMBER_NEWSTART; \ Identifier = FN_NUMBER_NEWSTART; \
HelpId = FN_NUMBER_NEWSTART; \ HelpId = CMD_FN_NUMBER_NEWSTART; \
Text[ en-US ] = "Restart Numbering"; \ Text[ en-US ] = "Restart Numbering"; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_NUM_CONTINUE; \ Identifier = FN_NUM_CONTINUE; \
HelpId = FN_NUM_CONTINUE; \ HelpId = CMD_FN_NUM_CONTINUE; \
Text[ en-US ] = "Continue previous numbering"; \ Text[ en-US ] = "Continue previous numbering"; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_NUM_BULLET_UP; \ Identifier = FN_NUM_BULLET_UP; \
HelpId = FN_NUM_BULLET_UP; \ HelpId = CMD_FN_NUM_BULLET_UP; \
Text[ en-US ] = "Up One Level"; \ Text[ en-US ] = "Up One Level"; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_NUM_BULLET_DOWN; \ Identifier = FN_NUM_BULLET_DOWN; \
HelpId = FN_NUM_BULLET_DOWN; \ HelpId = CMD_FN_NUM_BULLET_DOWN; \
Text[ en-US ] = "Down One Level"; \ Text[ en-US ] = "Down One Level"; \
}; };
@@ -354,19 +349,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_UPDATE_CUR_TOX ; \ Identifier = FN_UPDATE_CUR_TOX ; \
HelpID = FN_UPDATE_CUR_TOX ; \ HelpId = CMD_FN_UPDATE_CUR_TOX ; \
Text [ en-US ] = "~Update Index/Table"; \ Text [ en-US ] = "~Update Index/Table"; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_EDIT_CURRENT_TOX; \ Identifier = FN_EDIT_CURRENT_TOX; \
HelpID = FN_EDIT_CURRENT_TOX; \ HelpId = CMD_FN_EDIT_CURRENT_TOX; \
Text [ en-US ] = "~Edit Index/Table"; \ Text [ en-US ] = "~Edit Index/Table"; \
}; \ }; \
MenuItem \ MenuItem \
{ \ { \
Identifier = FN_REMOVE_CUR_TOX; \ Identifier = FN_REMOVE_CUR_TOX; \
HelpID = FN_REMOVE_CUR_TOX; \ HelpId = CMD_FN_REMOVE_CUR_TOX; \
Text [ en-US ] = "Delete Index/Table"; \ Text [ en-US ] = "Delete Index/Table"; \
}; \ }; \
SEPARATOR ; SEPARATOR ;
@@ -375,10 +370,6 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
_DEFAULT_TEXT_EDIT_ELEMENTS \ _DEFAULT_TEXT_EDIT_ELEMENTS \
}; \ }; \
}; };
=======
#include "swmn.hrc"
#include "helpid.h"
>>>>>>> other
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
Beschreibung: Menu Window Beschreibung: Menu Window

379
sw/source/ui/inc/swmn.hrc
View File

@@ -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

5
sw/source/ui/uiview/pview.cxx
View File

@@ -107,12 +107,7 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
<<<<<<< local
SFX_IMPL_VIEWFACTORY(SwPagePreView)
=======
SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview") SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview")
>>>>>>> other
{ {
SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwDocShell);
SFX_VIEW_REGISTRATION(SwWebDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell);

7
sw/source/ui/uiview/srcview.cxx
View File

@@ -125,18 +125,11 @@ using ::com::sun::star::util::SearchOptions;
#define BMARGPRN 1000 #define BMARGPRN 1000
#define BORDERPRN 300 #define BORDERPRN 300
<<<<<<< local
SFX_IMPL_VIEWFACTORY(SwSrcView)
=======
SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
>>>>>>> other
{ {
SFX_VIEW_REGISTRATION(SwWebDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell);
} }
SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
{ {
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU)); SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));

5
sw/source/ui/uiview/view0.cxx
View File

@@ -104,12 +104,7 @@ using ::rtl::OUString;
#include <unomid.h> #include <unomid.h>
<<<<<<< local
SFX_IMPL_VIEWFACTORY(SwView)
=======
SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
>>>>>>> other
{ {
if ( SvtModuleOptions().IsWriter() ) if ( SvtModuleOptions().IsWriter() )
{ {

15
sw/source/ui/vba/service.cxx
View File

@@ -66,21 +66,7 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
=======
void * SAL_CALL component_getFactory(
>>>>>>> other
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey ) registry::XRegistryKey * pRegistryKey )
{ {
@@ -91,3 +77,4 @@ extern "C"
return pRet; return pRet;
} }
} }

5
sw/source/ui/web/web.src
View File

@@ -79,8 +79,5 @@ String RID_WEBOLE_TOOLBOX
{ {
Text [ en-US ] = "Object/Web" ; Text [ en-US ] = "Object/Web" ;
}; };
<<<<<<< local
=======
/*************************************************************************
>>>>>>> other

5
sw/source/ui/web/wview.cxx
View File

@@ -93,16 +93,11 @@
#include <swslots.hxx> #include <swslots.hxx>
<<<<<<< local
SFX_IMPL_VIEWFACTORY(SwWebView)
=======
SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")
>>>>>>> other
{ {
SFX_VIEW_REGISTRATION(SwWebDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell);
} }
SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
{ {
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());