sc/source/ui/drawfunc/drtxtob1.cxx | 2 +-
sc/source/ui/view/editsh.cxx | 2 +-
sd/source/ui/func/fuchar.cxx | 2 +-
sfx2/sdi/sfx.sdi | 20 ++++++++++----------
svx/sdi/svx.sdi | 20 ++++++++++----------
sw/source/uibase/shells/annotsh.cxx | 4 +---
sw/source/uibase/shells/drwtxtex.cxx | 4 +---
7 files changed, 25 insertions(+), 29 deletions(-)
New commits:
commit 342c8c9da8f0eb36d2aaeb810e3946e8a09b8a0a
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Sep 3 17:50:56 2014 +0300
These slots not meant to be added to a toolbar or recorded
Change-Id: Iaf847c02265fcc7d75c1cd54bc836ec85cb830ec
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index d72d23d..f893324 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -6167,15 +6167,15 @@ SfxVoidItem StyleEndPreview SID_STYLE_END_PREVIEW
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordPerSet;
+ NoRecord;
Synchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TEMPLATE;
+ ToolBoxConfig = FALSE,
+ GroupId = ;
]
SfxVoidItem StylePreview SID_STYLE_PREVIEW
@@ -6191,15 +6191,15 @@ SfxVoidItem StylePreview SID_STYLE_PREVIEW
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordPerSet;
+ NoRecord;
Synchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TEMPLATE;
+ ToolBoxConfig = FALSE,
+ GroupId = ;
]
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 10b254f..839b243 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1691,17 +1691,17 @@ SvxFontItem CharPreviewFontName
SID_ATTR_CHAR_PREVIEW_FONT
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordPerSet;
+ NoRecord;
Synchron;
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
+ ToolBoxConfig = FALSE,
+ GroupId = ;
]
SvxFontItem CharEndPreviewFontName SID_ATTR_CHAR_ENDPREVIEW_FONT
@@ -1717,17 +1717,17 @@ SvxFontItem CharEndPreviewFontName
SID_ATTR_CHAR_ENDPREVIEW_FONT
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordPerSet;
+ NoRecord;
Synchron;
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
+ ToolBoxConfig = FALSE,
+ GroupId = ;
]
commit e201506a4cc7e1cac2d04ef3169ef37e34de379a
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Sun Aug 31 01:52:52 2014 +0300
Show the right tab for SID_CHAR_DLG_EFFECT
Change-Id: I3a8b7a9e973d20f06d423ec55cf689478ca98e0a
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx
b/sc/source/ui/drawfunc/drtxtob1.cxx
index d364ef2..6c12b0d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -53,7 +53,7 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet&
rArgs,
assert(pDlg && "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ pDlg->SetCurPageId("fonteffects");
}
bool bRet = ( pDlg->Execute() == RET_OK );
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index f0ffb70..5ab8b2b 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -460,7 +460,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
OSL_ENSURE(pDlg, "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ pDlg->SetCurPageId("fonteffects");
}
short nRet = pDlg->Execute();
// pDlg is needed below
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 222634c..8b929c3 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -77,7 +77,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
{
if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ pDlg->SetCurPageId("RID_SVXPAGE_CHAR_EFFECTS");
}
nResult = pDlg->Execute();
commit f3cec45a2e240fcf4ab84e77d51e2b700492f830
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Sun Aug 31 01:01:21 2014 +0300
Simplify this
No other SIDs here have any args anyway.
Change-Id: I8444a40d1d428f671f65dc536ec507a6c0611b61
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index 7ead827..c44c9a8 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -466,9 +466,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case SID_CHAR_DLG:
{
const SfxItemSet* pArgs = rReq.GetArgs();
- const SfxStringItem* pItem = 0;
- if (pArgs && nSlot == SID_CHAR_DLG)
- pItem = static_cast< const SfxStringItem*
>(pArgs->GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) ) );
+ SFX_REQUEST_ARG(rReq, pItem, SfxStringItem, FN_PARAM_1, false);
if( !pArgs || pItem )
{
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index fef670e..6cf3c14 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -298,9 +298,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
case SID_CHAR_DLG_FOR_PARAGRAPH:
{
const SfxItemSet* pArgs = rReq.GetArgs();
- const SfxStringItem* pItem = 0;
- if (pArgs && nSlot == SID_CHAR_DLG)
- pItem = static_cast< const SfxStringItem*
>(pArgs->GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) ) );
+ SFX_REQUEST_ARG(rReq, pItem, SfxStringItem, FN_PARAM_1, false);
if( !pArgs || pItem )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
