[ooo-build-commit] Branch 'ooo/master' - sd/sdi sd/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Aug 5 17:46:58 PDT 2009
sd/sdi/tables.sdi | 10 +
sd/source/filter/eppt/epptso.cxx | 6
sd/source/filter/pptin.cxx | 16 ++
sd/source/ui/app/menuids_tmpl.src | 1
sd/source/ui/app/popup.src | 152 ++++++++++++++++++++++
sd/source/ui/app/popup2_tmpl.src | 22 +--
sd/source/ui/dlg/dlgass.cxx | 12 +
sd/source/ui/dlg/dlgass.src | 14 +-
sd/source/ui/dlg/prltempl.cxx | 106 +--------------
sd/source/ui/dlg/prltempl.src | 103 +-------------
sd/source/ui/docshell/docshel4.cxx | 57 ++++++--
sd/source/ui/func/fuprobjs.cxx | 2
sd/source/ui/func/fusel.cxx | 3
sd/source/ui/func/futempl.cxx | 15 +-
sd/source/ui/func/futext.cxx | 2
sd/source/ui/inc/dlgass.hrc | 2
sd/source/ui/inc/prltempl.hrc | 6
sd/source/ui/inc/res_bmp.hrc | 2
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1
sd/source/ui/table/TableDesignPane.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 26 +++
sd/source/ui/toolpanel/LayoutMenu.cxx | 3
sd/source/ui/unoidl/unomodel.cxx | 12 +
sd/source/ui/view/drviews4.cxx | 11 +
sd/source/ui/view/drviewsj.cxx | 4
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/sdview2.cxx | 4
27 files changed, 344 insertions(+), 254 deletions(-)
New commits:
commit f0e0284678b08a0c1ca10e396b7e6c959a26617b
Author: Release Engineers <releng at openoffice.org>
Date: Wed Aug 5 17:01:07 2009 +0000
CWS-TOOLING: integrate CWS impress172
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk at 273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index 79820a7..83b7480 100644
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.sdi
@@ -90,6 +90,16 @@ shell TableObjectBar
ExecMethod = Execute;
StateMethod = GetState;
]
+ SID_TABLE_INSERT_ROW_DLG
+ [
+ ExecMethod = Execute;
+ StateMethod = GetState;
+ ]
+ SID_TABLE_INSERT_COL_DLG
+ [
+ ExecMethod = Execute;
+ StateMethod = GetState;
+ ]
SID_TABLE_DELETE_ROW
[
ExecMethod = Execute;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 31bd558..7bdf54e 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -4929,9 +4929,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( mbPresObj )
{
nOutlinerCount++;
- if ( rLayout.bOutlinerPossible && ( nOutlinerCount == 1 ) ||
- ( ( rLayout.bSecOutlinerPossible && ( nOutlinerCount == 2 ) )
- && ( nPrevTextStyle == EPP_TEXTSTYLE_BODY ) ) )
+ if ( (rLayout.bOutlinerPossible && ( nOutlinerCount == 1 )) ||
+ (( rLayout.bSecOutlinerPossible && ( nOutlinerCount == 2 ) ) && ( nPrevTextStyle == EPP_TEXTSTYLE_BODY ))
+ )
{
ImplGetText();
TextObj aTextObj( mXText, EPP_TEXTTYPE_Body, maFontCollection, (PPTExBulletProvider&)*this );
diff --git a/sd/source/filter/pptin.cxx b/sd/source/filter/pptin.cxx
index ca8b165..36f159b 100644
--- a/sd/source/filter/pptin.cxx
+++ b/sd/source/filter/pptin.cxx
@@ -521,6 +521,22 @@ sal_Bool ImplSdPPTImport::Import()
pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (USHORT)nPageNumber + 1 ) );
}
}
+ else // searching for "FIRST" or "LAST" page
+ {
+ for ( nToken = 0; nToken < nTokenCount; nToken++ )
+ {
+ if ( aStringAry[ nToken ] == "FIRST" )
+ {
+ pHyperlink->aConvSubString = String( RTL_CONSTASCII_USTRINGPARAM( "action?jump=firstslide" ) );
+ break;
+ }
+ else if ( aStringAry[ nToken ] == "LAST" )
+ {
+ pHyperlink->aConvSubString = String( RTL_CONSTASCII_USTRINGPARAM( "action?jump=lastslide" ) );
+ break;
+ }
+ }
+ }
}
aHyperList.Insert( pHyperlink, LIST_APPEND );
}
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index a202945..2f2b5da 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -1305,3 +1305,4 @@
};\
};\
};
+
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 3a29133..99096db 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -67,6 +67,158 @@ Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
MN_STYLEDT
};
};
+
+Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
+{
+ ItemList =
+ {
+ MN_SET_DEFAULT
+ SEPARATOR
+ MN_TEXTATTR
+ SEPARATOR
+ MN_TEXT_ATTR
+ MN_TEXT_ALIGN
+ MN_LINESPACING_ATTR
+ SEPARATOR
+ MN_CHAR_PARAGRAPH
+ SEPARATOR
+ MenuItem
+ {
+ Identifier = SID_FORMAT_TABLE_DLG;
+ HelpID = SID_FORMAT_TABLE_DLG;
+ Text [ en-US ] = "~Table...";
+ };
+ MenuItem
+ {
+ Identifier = DUMMY + 10 ;
+ Command = ".uno:CellMenu" ;
+ Text [ en-US ] = "~Cell" ;
+ SubMenu = Menu
+ {
+ ItemList =
+ {
+ MenuItem
+ {
+ Identifier = SID_TABLE_MERGE_CELLS;
+ HelpID = SID_TABLE_MERGE_CELLS;
+ Text [ en-US ] = "~Merge";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_SPLIT_CELLS;
+ HelpID = SID_TABLE_SPLIT_CELLS;
+ Text [ en-US ] = "~Split...";
+ };
+ SEPARATOR
+ MenuItem
+ {
+ Identifier = SID_TABLE_VERT_NONE;
+ HelpID = SID_TABLE_VERT_NONE;
+ Text [ en-US ] = "~Top";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_VERT_CENTER;
+ HelpID = SID_TABLE_VERT_CENTER;
+ Text [ en-US ] = "C~enter";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_VERT_BOTTOM;
+ HelpID = SID_TABLE_VERT_BOTTOM;
+ Text [ en-US ] = "~Bottom";
+ };
+ };
+ };
+ };
+ MenuItem
+ {
+ Identifier = DUMMY + 11 ;
+ Command = ".uno:RowMenu" ;
+ Text [ en-US ] = "~Row" ;
+ SubMenu = Menu
+ {
+ ItemList =
+ {
+ MenuItem
+ {
+ Identifier = SID_TABLE_DISTRIBUTE_ROWS;
+ HelpID = SID_TABLE_DISTRIBUTE_ROWS;
+ Text [ en-US ] = "Space ~Equally";
+ };
+ SEPARATOR
+ MenuItem
+ {
+ Identifier = SID_TABLE_SELECT_ROW;
+ HelpID = SID_TABLE_SELECT_ROW;
+ Text [ en-US ] = "~Select";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_INSERT_ROW_DLG;
+ HelpID = SID_TABLE_INSERT_ROW_DLG;
+ Text [ en-US ] = "~Insert...";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_DELETE_ROW;
+ HelpID = SID_TABLE_DELETE_ROW;
+ Text [ en-US ] = "~Delete";
+ };
+ };
+ };
+ };
+ MenuItem
+ {
+ Identifier = DUMMY + 12 ;
+ Command = ".uno:ColumnMenu" ;
+ Text [ en-US ] = "Colu~mn" ;
+ SubMenu = Menu
+ {
+ ItemList =
+ {
+ MenuItem
+ {
+ Identifier = SID_TABLE_DISTRIBUTE_COLUMNS;
+ HelpID = SID_TABLE_DISTRIBUTE_COLUMNS;
+ Text [ en-US ] = "Space ~Equally";
+ };
+ SEPARATOR
+ MenuItem
+ {
+ Identifier = SID_TABLE_SELECT_COL;
+ HelpID = SID_TABLE_SELECT_COL;
+ Text [ en-US ] = "~Select";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_INSERT_COL_DLG;
+ HelpID = SID_TABLE_INSERT_COL_DLG;
+ Text [ en-US ] = "~Insert...";
+ };
+ MenuItem
+ {
+ Identifier = SID_TABLE_DELETE_COL;
+ HelpID = SID_TABLE_DELETE_COL;
+ Text [ en-US ] = "~Delete";
+ };
+ };
+ };
+ };
+ SEPARATOR
+ MenuItem
+ {
+ ITEM_OPEN_HYPERLINK
+ };
+ SEPARATOR
+ MN_BULLET
+ ITEM_FORMAT_NUMBERING
+ ITEM_TRANSLITERATE_MENU
+ SEPARATOR
+ MN_STYLEDT
+ };
+};
+
Menu RID_DRAW_CONTROL_POPUP
{
ItemList =
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index 3f03066..a9a10fb 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -740,7 +740,7 @@
Text [ en-US ] = "~Table...";
};
MenuItem
- {
+ {
Identifier = DUMMY + 10 ;
Command = ".uno:CellMenu" ;
Text [ en-US ] = "~Cell" ;
@@ -783,7 +783,7 @@
};
};
MenuItem
- {
+ {
Identifier = DUMMY + 11 ;
Command = ".uno:RowMenu" ;
Text [ en-US ] = "~Row" ;
@@ -806,21 +806,21 @@
};
MenuItem
{
- Identifier = SID_TABLE_INSERT_ROW;
- HelpID = SID_TABLE_INSERT_ROW;
- Text [ en-US ] = "~Insert";
+ Identifier = SID_TABLE_INSERT_ROW_DLG;
+ HelpID = SID_TABLE_INSERT_ROW_DLG;
+ Text [ en-US ] = "~Insert...";
};
MenuItem
{
Identifier = SID_TABLE_DELETE_ROW;
HelpID = SID_TABLE_DELETE_ROW;
Text [ en-US ] = "~Delete";
- };
+ };
};
};
};
MenuItem
- {
+ {
Identifier = DUMMY + 12 ;
Command = ".uno:ColumnMenu" ;
Text [ en-US ] = "Colu~mn" ;
@@ -843,16 +843,16 @@
};
MenuItem
{
- Identifier = SID_TABLE_INSERT_COL;
- HelpID = SID_TABLE_INSERT_COL;
- Text [ en-US ] = "~Insert";
+ Identifier = SID_TABLE_INSERT_COL_DLG;
+ HelpID = SID_TABLE_INSERT_COL_DLG;
+ Text [ en-US ] = "~Insert...";
};
MenuItem
{
Identifier = SID_TABLE_DELETE_COL;
HelpID = SID_TABLE_DELETE_COL;
Text [ en-US ] = "~Delete";
- };
+ };
};
};
};
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 5eff17b..d20b57c 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -304,6 +304,9 @@ public:
OKButton maFinishButton;
SdDocPreviewWin maPreview;
+ String maCreateStr;
+ String maOpenStr;
+
// Seite 1
FixedBitmap* mpPage1FB;
FixedLine* mpPage1ArtFL;
@@ -382,7 +385,9 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
maLastPageButton(pWindow,SdResId(BUT_LAST)),
maNextPageButton(pWindow,SdResId(BUT_NEXT)),
maFinishButton(pWindow,SdResId(BUT_FINISH)),
- maPreview(pWindow,SdResId(CT_PREVIEW))
+ maPreview(pWindow,SdResId(CT_PREVIEW)),
+ maCreateStr(SdResId(STR_CREATE)),
+ maOpenStr(SdResId(STR_OPEN))
{
maPageListFile += sal_Unicode('?'),
mbRecentDocumentsReady = FALSE;
@@ -968,6 +973,11 @@ void AssistentDlgImpl::SetStartType( StartType eType )
mpPage1TemplateLB->Show(eType == ST_TEMPLATE);
mpPage1OpenLB->Show(eType == ST_OPEN);
mpPage1OpenPB->Show(eType == ST_OPEN);
+
+ if (eType == ST_OPEN)
+ maFinishButton.SetText(maOpenStr);
+ else
+ maFinishButton.SetText(maCreateStr);
}
StartType AssistentDlgImpl::GetStartType()
diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
index b172c34..09bca43 100644
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
@@ -54,7 +54,7 @@ ModalDialog DLG_ASS
Pos = MAP_APPFONT ( 144 , 140 );
Size = MAP_APPFONT ( 122 , 10 );
TabStop = TRUE;
- Text [ en-US ] = "~Preview";
+ Text [ en-US ] = "Previe~w";
};
CheckBox CB_STARTWITH
@@ -104,7 +104,7 @@ ModalDialog DLG_ASS
{
Pos = MAP_APPFONT ( 12 , 76 );
Size = MAP_APPFONT ( 130 , 10 );
- Text [ en-US ] = "~Open existing presentation";
+ Text [ en-US ] = "O~pen existing presentation";
};
PushButton PB_PAGE1_OPEN
@@ -533,6 +533,16 @@ ModalDialog DLG_ASS
TabStop = TRUE ;
Text [ en-US ] = "~Create" ;
};
+
+ String STR_OPEN
+ {
+ Text [ en-US ] = "~Open";
+ };
+
+ String STR_CREATE
+ {
+ Text [ en-US ] = "~Create" ;
+ };
};
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 99e5f60..ec58791 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -84,7 +84,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
pOutSet ( NULL ),
pOrgSet ( &rStyleBase.GetItemSet() )
{
- if( DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_3 && IS_OUTLINE(ePO))
+ if( IS_OUTLINE(ePO))
{
// Leider sind die Itemsets unserer Stylesheets nicht discret..
const USHORT* pPtr = pOrgSet->GetRanges();
@@ -129,29 +129,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
aInputSet.Put( *pItem );
}
-/* #i35937#
- // Jetzt noch das mapping von 10er auf 9er und des lrspace.
- if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE) )
- {
- SdBulletMapper::PreMapNumBulletForDialog( aInputSet );
- SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET);
- SvxNumRule* pRule = pBulletItem->GetNumRule();
- if(pRule)
- {
- SvxLRSpaceItem aLRItem(EE_PARA_LRSPACE);
- if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_LRSPACE) )
- aLRItem = *(SvxLRSpaceItem*)aInputSet.GetItem(EE_PARA_LRSPACE);
-
- const SvxNumberFormat& aActFmt = pRule->GetLevel( GetOutlineLevel() );
-
- aLRItem.SetTxtLeft( aActFmt.GetAbsLSpace() );
- aLRItem.SetTxtFirstLineOfst( aActFmt.GetFirstLineOffset() );
-
- aInputSet.Put(aLRItem);
- }
- }
-*/
-
// gewaehlte Ebene im Dialog vorselektieren
aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, 1<<GetOutlineLevel()));
@@ -193,60 +170,27 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
AddTabPage( RID_SVXPAGE_CHAR_NAME );
AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
+ AddTabPage( RID_SVXPAGE_TEXTATTR );
+ AddTabPage( RID_SVXPAGE_TABULATOR );
}
break;
- case TAB_PRES_LAYOUT_TEMPLATE_1:
- AddTabPage( RID_SVXPAGE_LINE);
- break;
-
- case TAB_PRES_LAYOUT_TEMPLATE_2:
+ case TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND: // background
AddTabPage( RID_SVXPAGE_AREA);
break;
-
- case TAB_PRES_LAYOUT_TEMPLATE_3:
- {
- AddTabPage( RID_SVXPAGE_CHAR_NAME );
- AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
- AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
- if(IS_OUTLINE(ePO))
- {
- AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
- AddTabPage( RID_SVXPAGE_PICK_BULLET );
- AddTabPage( RID_SVXPAGE_PICK_BMP );
- AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
- }
- else
- {
- RemoveTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
- RemoveTabPage( RID_SVXPAGE_PICK_BULLET );
- RemoveTabPage( RID_SVXPAGE_PICK_BMP );
- RemoveTabPage( RID_SVXPAGE_NUM_OPTIONS );
- }
- }
- break;
}
// #112490# the tabpages Alignment, Tabs and Asian Typography are very
// usefull, except for the background style
- if( (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE) || (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_3) )
+ if( DlgId.GetId() != TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND )
{
SvtCJKOptions aCJKOptions;
- if( aCJKOptions.IsAsianTypographyEnabled() && (ePO != PO_BACKGROUND ) )
+ if( aCJKOptions.IsAsianTypographyEnabled() )
AddTabPage( RID_SVXPAGE_PARA_ASIAN );
else
RemoveTabPage( RID_SVXPAGE_PARA_ASIAN );
- if( ePO != PO_BACKGROUND )
- {
- AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
- AddTabPage( RID_SVXPAGE_TABULATOR );
- }
- else
- {
- RemoveTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
- RemoveTabPage( RID_SVXPAGE_TABULATOR );
- }
+ AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
}
// Titel setzen und
@@ -257,12 +201,10 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
{
case PO_TITLE:
aTitle = String(SdResId( STR_PSEUDOSHEET_TITLE ));
- RemoveTabPage( TP_ENUM_BULLET );
break;
case PO_SUBTITLE:
aTitle = String(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
- RemoveTabPage( TP_ENUM_BULLET );
break;
case PO_BACKGROUND:
@@ -289,7 +231,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
case PO_NOTES:
aTitle = String(SdResId( STR_PSEUDOSHEET_NOTES ));
- RemoveTabPage( TP_ENUM_BULLET );
break;
}
SetText( aTitle );
@@ -384,39 +325,6 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const
const SvxNumBulletItem *pSvxNumBulletItem = NULL;
if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pSvxNumBulletItem ))
SdBulletMapper::MapFontsInNumRule( *pSvxNumBulletItem->GetNumRule(), *pOutSet );
-
-/* #i35937#
- // Wenn das lrspace geaendert wurde muss die Aenderung in das
- // Bullet Item gemapt werden...
- if( SFX_ITEM_SET == pOutSet->GetItemState( EE_PARA_LRSPACE, FALSE ) )
- {
- BOOL bNumBulletHasChanged = pSvxNumBulletItem != NULL;
- if( !bNumBulletHasChanged )
- pSvxNumBulletItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET);
-
- if( pSvxNumBulletItem )
- {
- SvxLRSpaceItem& rLRItem = *(SvxLRSpaceItem*)pOutSet->GetItem( EE_PARA_LRSPACE );
-
- SvxNumRule* pNumRule = pSvxNumBulletItem->GetNumRule();
- if(pNumRule)
- {
- SvxNumberFormat aFrmt( pNumRule->GetLevel( GetOutlineLevel() ));
-
- aFrmt.SetLSpace( (short) rLRItem.GetTxtLeft() );
- aFrmt.SetAbsLSpace( (short) rLRItem.GetTxtLeft() );
- aFrmt.SetFirstLineOffset( rLRItem.GetTxtFirstLineOfst() );
- pNumRule->SetLevel( GetOutlineLevel(), aFrmt );
- }
- }
-
- if( !bNumBulletHasChanged && pSvxNumBulletItem )
- pOutSet->Put( SvxNumBulletItem( *pSvxNumBulletItem->GetNumRule(), EE_PARA_NUMBULLET ) );
- }
-
- SdBulletMapper::PostMapNumBulletForDialog( *pOutSet );
-*/
-
return pOutSet;
}
else
diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src
index c8739d2..fe1cc15 100644
--- a/sd/source/ui/dlg/prltempl.src
+++ b/sd/source/ui/dlg/prltempl.src
@@ -86,6 +86,12 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE
Text [ en-US ] = "Indents & Spacing" ;
PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
};
+ PageItem
+ {
+ Identifier = RID_SVXPAGE_TEXTATTR ;
+ PageResID = RID_SVXPAGE_TEXTATTR ;
+ Text [ en-US ] = "Text" ;
+ };
PageItem
{
Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ;
@@ -107,29 +113,8 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE
};
};
};
-TabDialog TAB_PRES_LAYOUT_TEMPLATE_1
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 289 , 176 ) ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = RID_SVXPAGE_LINE ;
- Text [ en-US ] = "Line" ;
- PageResID = RID_SVXPAGE_LINE ;
- };
- };
- };
-};
-TabDialog TAB_PRES_LAYOUT_TEMPLATE_2
+
+TabDialog TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND
{
OutputSize = TRUE ;
SVLook = TRUE ;
@@ -151,78 +136,6 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE_2
};
};
};
-TabDialog TAB_PRES_LAYOUT_TEMPLATE_3
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 289 , 176 ) ;
- Moveable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 260 , 135 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = RID_SVXPAGE_CHAR_NAME ;
- Text [ en-US ] = "Font" ;
- PageResID = RID_SVXPAGE_CHAR_NAME ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_CHAR_EFFECTS ;
- Text [ en-US ] = "Font Effects" ;
- PageResID = RID_SVXPAGE_CHAR_EFFECTS ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_STD_PARAGRAPH ;
- Text [ en-US ] = "Indents & Spacing" ;
- PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_BULLET ;
- Text [ en-US ] = "Bullets" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
- Text [ en-US ] = "Numbering type" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PICK_BMP ;
- Text [ en-US ] = "Graphics" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_NUM_OPTIONS ;
- Text [ en-US ] = "Customize" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ;
- PageResID = RID_SVXPAGE_ALIGN_PARAGRAPH ;
- Text [ en-US ] = "Alignment" ;
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_PARA_ASIAN ;
- PageResID = RID_SVXPAGE_PARA_ASIAN ;
- Text[ en-US ] = "Asian Typography";
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_TABULATOR ;
- PageResID = RID_SVXPAGE_TABULATOR ;
- Text [ en-US ] = "Tabs" ;
- };
- };
- };
-};
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 062d3b0..1ab4132 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -759,24 +759,59 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark)
DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell);
ViewShellBase& rBase (mpViewShell->GetViewShellBase());
- String aBookmark( rBookmark );
-
- // Ist das Bookmark eine Seite?
- BOOL bIsMasterPage;
- USHORT nPageNumber = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
+ BOOL bIsMasterPage = sal_False;
+ USHORT nPageNumber = SDRPAGE_NOTFOUND;
SdrObject* pObj = NULL;
- if (nPageNumber == SDRPAGE_NOTFOUND)
+ rtl::OUString sBookmark( rBookmark );
+ const rtl::OUString sInteraction( RTL_CONSTASCII_USTRINGPARAM( "action?" ) );
+ if ( sBookmark.match( sInteraction ) )
{
- // Ist das Bookmark ein Objekt?
- pObj = mpDoc->GetObj(aBookmark);
-
- if (pObj)
+ const rtl::OUString sJump( RTL_CONSTASCII_USTRINGPARAM( "jump=" ) );
+ if ( sBookmark.match( sJump, sInteraction.getLength() ) )
{
- nPageNumber = pObj->GetPage()->GetPageNum();
+ rtl::OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) );
+ if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "firstslide" ) ) ) )
+ {
+ nPageNumber = 1;
+ }
+ else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "lastslide" ) ) ) )
+ {
+ nPageNumber = mpDoc->GetPageCount() - 2;
+ }
+ else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "previousslide" ) ) ) )
+ {
+ SdPage* pPage = pDrawViewShell->GetActualPage();
+ nPageNumber = pPage->GetPageNum();
+ nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND;
+ }
+ else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "nextslide" ) ) ) )
+ {
+ SdPage* pPage = pDrawViewShell->GetActualPage();
+ nPageNumber = pPage->GetPageNum() + 2;
+ if ( nPageNumber >= mpDoc->GetPageCount() )
+ nPageNumber = SDRPAGE_NOTFOUND;
+ }
}
}
+ else
+ {
+ String aBookmark( rBookmark );
+
+ // Ist das Bookmark eine Seite?
+ nPageNumber = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
+
+ if (nPageNumber == SDRPAGE_NOTFOUND)
+ {
+ // Ist das Bookmark ein Objekt?
+ pObj = mpDoc->GetObj(aBookmark);
+ if (pObj)
+ {
+ nPageNumber = pObj->GetPage()->GetPageNum();
+ }
+ }
+ }
if (nPageNumber != SDRPAGE_NOTFOUND)
{
// Jump to the bookmarked page. This is done in three steps.
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index cdc75ad..94ce4a4 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -134,7 +134,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
{
String aStyleName = aLayoutName;
aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) );
- USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE_3;
+ USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
PresentationObjects ePO;
if( bPage )
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 08beb46..0c6ca10 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -842,8 +842,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
pSingleObj = mpView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
}
- if ( nSlotId != SID_OBJECT_SELECT &&
- (/* bTempRotation && */ nMarkCount==0) ||
+ if ( (nSlotId != SID_OBJECT_SELECT && nMarkCount==0) ||
( mpView->GetDragMode() == SDRDRAG_CROOK &&
!mpView->IsCrookAllowed( mpView->IsCrookNoContortion() ) ) ||
( mpView->GetDragMode() == SDRDRAG_SHEAR &&
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 3e6cbe1..08f8281 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -337,18 +337,18 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE)))
{
- nDlgId = TAB_PRES_LAYOUT_TEMPLATE_3;
+ nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_TITLE;
}
else if (aName == String(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
{
- nDlgId = TAB_PRES_LAYOUT_TEMPLATE_3;
+ nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_SUBTITLE;
}
else if (aName ==
String(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
{
- nDlgId = TAB_PRES_LAYOUT_TEMPLATE_2;
+ nDlgId = TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND;
ePO = PO_BACKGROUND;
}
else if (aName ==
@@ -360,13 +360,13 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
else if (aName ==
String(SdResId(STR_PSEUDOSHEET_NOTES)))
{
- nDlgId = TAB_PRES_LAYOUT_TEMPLATE_3;
+ nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_NOTES;
}
else if(aName.Search(String(SdResId(STR_PSEUDOSHEET_OUTLINE))) !=
STRING_NOTFOUND)
{
- nDlgId = TAB_PRES_LAYOUT_TEMPLATE_3;
+ nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
String aOutlineStr((SdResId(STR_PSEUDOSHEET_OUTLINE)));
// die Nummer ermitteln; ein Leerzeichen zwischen
@@ -696,9 +696,8 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
case SID_STYLE_UPDATE_BY_EXAMPLE:
{
- if (mpView->AreObjectsMarked() &&
- mpView->GetMarkedObjectList().GetMarkCount() == 1 ||
- mpView->ISA(OutlineView))
+ if ((mpView->AreObjectsMarked() && mpView->GetMarkedObjectList().GetMarkCount() == 1) ||
+ mpView->ISA(OutlineView))
{
pStyleSheet = mpView->GetStyleSheet();
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 4a6032e..cb1e38e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -659,7 +659,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- if( mpView && mpView->MouseButtonUp(rMEvt, mpWindow) || rMEvt.GetClicks() == 2 )
+ if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 )
return (TRUE); // Event von der SdrView ausgewertet
BOOL bEmptyTextObj = FALSE;
diff --git a/sd/source/ui/inc/dlgass.hrc b/sd/source/ui/inc/dlgass.hrc
index 2c1d55e..6199722 100644
--- a/sd/source/ui/inc/dlgass.hrc
+++ b/sd/source/ui/inc/dlgass.hrc
@@ -86,4 +86,6 @@
#define CT_PAGE5_PAGELIST 62
#define CB_PAGE5_SUMMARY 63
+#define STR_CREATE 64
+#define STR_OPEN 65
#define DLG_ASS 900
diff --git a/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc
index 75b3641..81d3354 100644
--- a/sd/source/ui/inc/prltempl.hrc
+++ b/sd/source/ui/inc/prltempl.hrc
@@ -29,8 +29,6 @@
************************************************************************/
#include <sfx2/sfx.hrc>
/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */
-#define TAB_PRES_LAYOUT_TEMPLATE 844
-#define TAB_PRES_LAYOUT_TEMPLATE_1 845
-#define TAB_PRES_LAYOUT_TEMPLATE_2 846
-#define TAB_PRES_LAYOUT_TEMPLATE_3 847
+#define TAB_PRES_LAYOUT_TEMPLATE 844
+#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846
#define TAB_CONTROL 1
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 42b1cd7..676590d 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -306,6 +306,8 @@
#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93
+#define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94
+
/*
* Pointer (Mauszeiger)
*/
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 76fc324..424b9c2 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -112,7 +112,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter)
// Hide the page that contains the page objects.
SetPageVisible (FALSE);
- maPageModel.GetItemPool().FreezeIdRanges();
// call FreezeIdRanges() at the pool from the newly constructed SdrModel,
// else creating SfxItemSets on it will complain
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 044c46b..0b6cb9a 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -127,7 +127,7 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool
mxControls[CT_TABLE_STYLES].reset( pValueSet );
if( !mbModal )
{
- pValueSet->SetStyle( pValueSet->GetStyle() & ~(WB_ITEMBORDER|WB_BORDER) | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_NOBORDER );
+ pValueSet->SetStyle( (pValueSet->GetStyle() & ~(WB_ITEMBORDER|WB_BORDER)) | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_NOBORDER );
pValueSet->SetColor();
pValueSet->SetExtraSpacing(8);
}
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 5bb1039..2707d01 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -43,6 +43,8 @@
#include <svtools/itempool.hxx>
#include <svx/svdomedia.hxx>
#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
#include "app.hrc"
@@ -158,8 +160,32 @@ void TableObjectBar::Execute( SfxRequest& rReq )
SfxBindings* pBindings = &mpViewSh->GetViewFrame()->GetBindings();
rtl::Reference< sdr::SelectionController > xController( mpView->getSelectionController() );
+ ULONG nSlotId = rReq.GetSlot();
if( xController.is() )
{
+ switch( nSlotId )
+ {
+ case SID_TABLE_INSERT_ROW_DLG:
+ case SID_TABLE_INSERT_COL_DLG:
+ {
+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, nSlotId) : 0);
+
+ if( pDlg.get() && (pDlg->Execute() == 1) )
+ {
+ if( nSlotId == SID_TABLE_INSERT_ROW_DLG )
+ nSlotId = SID_TABLE_INSERT_ROW;
+ else
+ nSlotId = SID_TABLE_INSERT_COL;
+
+ rReq.AppendItem( SfxInt16Item( (USHORT)nSlotId, (sal_uInt16)pDlg->getInsertCount() ) );
+ rReq.AppendItem( SfxBoolItem( SID_TABLE_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ) );
+
+ rReq.SetSlot( (USHORT)nSlotId );
+ }
+ }
+ }
+
xController->Execute( rReq );
}
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 59241fe..8338af0 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -241,8 +241,7 @@ LayoutMenu::LayoutMenu (
mbIsMainViewChangePending(false)
{
SetStyle (
- GetStyle()
- & ~(WB_ITEMBORDER)
+ ( GetStyle() & ~(WB_ITEMBORDER) )
| WB_TABSTOP
| WB_NO_DIRECTSELECT
);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 85edefa..e04a6e7 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -988,22 +988,26 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c
return sd::DocumentSettings_createInstance( this );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextField.DateTime") ) )
+ if( ( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextField.DateTime") ) ) ||
+ ( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.textfield.DateTime") ) ) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField( ID_EXT_DATEFIELD );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.Header") ) )
+ if( (0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.Header"))) ||
+ (0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.textfield.Header"))) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField( ID_HEADERFIELD );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.Footer") ) )
+ if( (0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.Footer"))) ||
+ (0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.textfield.Footer"))) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField( ID_FOOTERFIELD );
}
- if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.DateTime") ) )
+ if( (0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TextField.DateTime"))) ||
+ (0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.textfield.DateTime"))) )
{
return (::cppu::OWeakObject * )new SvxUnoTextField( ID_DATETIMEFIELD );
}
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 660d2e0..b85a6a8 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -658,7 +658,16 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
UnlockInput();
}
else
- nSdResId = RID_DRAW_TEXTOBJ_INSIDE_POPUP;
+ {
+ if( (pObj->GetObjInventor() == SdrInventor) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
+ {
+ nSdResId = RID_DRAW_TABLEOBJ_INSIDE_POPUP;
+ }
+ else
+ {
+ nSdResId = RID_DRAW_TEXTOBJ_INSIDE_POPUP;
+ }
+ }
}
}
else
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index d859f2e..8d71d70 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -196,9 +196,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
//rSet.DisableItem( SID_ATTRIBUTES_AREA ); // wieder raus!
rSet.DisableItem( SID_ATTR_FILL_STYLE );
}
- if( !pObj->ISA( SdrPathObj ) &&
- !aInfoRec.bCanConvToPath ||
- pObj->ISA( SdrObjGroup ) ) // Solange es JOE fehlerhaft behandelt!
+ if( (!pObj->ISA( SdrPathObj ) && !aInfoRec.bCanConvToPath) || pObj->ISA( SdrObjGroup ) ) // Solange es JOE fehlerhaft behandelt!
{ // JOE: Ein Gruppenobjekt kann eben u.U. in ein PathObj gewandelt werden
rSet.DisableItem( SID_LINEEND_POLYGON );
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 2c8b718..0cdb657 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1541,8 +1541,8 @@ BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
// Pruefen und Unterscheiden von CursorBewegungs- oder Eingabe-Keys
KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() );
- if( aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS ||
- GetActualPage() != pLastPage )
+ if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) ||
+ (GetActualPage() != pLastPage) )
{
Invalidate( SID_PREVIEW_STATE );
}
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 83af8ad..9040f51 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -565,7 +565,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
BOOL bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA );
// check handle insert
- if( !nRet && ( bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() ) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) )
+ if( !nRet && ( (bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() )) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) )
{
const SdrHdlList& rHdlList = GetHdlList();
@@ -721,7 +721,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
aPos = pTargetWindow->PixelToLogic( rEvt.maPosPixel );
// handle insert?
- if( !nRet && ( SDRDRAG_GRADIENT == GetDragMode() ) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) && aDataHelper.HasFormat( SOT_FORMATSTR_ID_XFA ) )
+ if( (!nRet && ( SDRDRAG_GRADIENT == GetDragMode() )) || (( SDRDRAG_TRANSPARENCE == GetDragMode() ) && aDataHelper.HasFormat( SOT_FORMATSTR_ID_XFA )) )
{
const SdrHdlList& rHdlList = GetHdlList();
More information about the ooo-build-commit
mailing list