summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorJacobo Aragunde PĂ©rez <jaragunde@igalia.com>2013-10-01 10:59:01 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-10-16 10:24:00 +0000
commit2eba5391d3fa3232ba2b0a187c4c51736ab2ec3d (patch)
treecf06fece8abd86dc586cf137ac450e817ff50842 /cui
parentb3362fc9cb410599ac54fc3badfad75354c98d84 (diff)
unotools: add menu option to enable/disable Smart-Art lock
The point of this menu option is that locked Smart-Art shapes would preserve the original XML files attached so they could be exported back to docx with no loss. The new menu option is located at Options -> Load/Save -> MS Office -> SmartArt to LibreOffice shapes or reverse. Change-Id: I6aafc2eb83404ee2c0b8538b2f6fbbbd4363e7d3 Reviewed-on: https://gerrit.libreoffice.org/6138 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/inc/cuires.hrc2
-rw-r--r--cui/source/options/optfltr.cxx6
-rw-r--r--cui/source/options/optfltr.hxx3
-rw-r--r--cui/source/options/optfltr.src4
4 files changed, 14 insertions, 1 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 0b8cf5a6df32..4a887c292435 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -454,6 +454,8 @@
#define RID_SVXSTR_YES (RID_SVX_START + 1249)
#define RID_SVXSTR_NO (RID_SVX_START + 1250)
+#define RID_SVXSTR_CHG_SMARTART (RID_SVX_START + 1251)
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d6ec2973974b..30409b4e8007 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -32,6 +32,7 @@ enum MSFltrPg2_CheckBoxEntries {
Writer,
Calc,
Impress,
+ SmartArt,
InvalidCBEntry
};
@@ -136,6 +137,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSe
sChgToFromWriter(CUI_RES(RID_SVXSTR_CHG_WRITER)),
sChgToFromCalc(CUI_RES(RID_SVXSTR_CHG_CALC)),
sChgToFromImpress(CUI_RES(RID_SVXSTR_CHG_IMPRESS)),
+ sChgToFromSmartArt(CUI_RES(RID_SVXSTR_CHG_SMARTART)),
pCheckButtonData(0)
{
get(m_pCheckLBContainer, "checklbcontainer");
@@ -193,6 +195,8 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
&SvtFilterOptions::SetPowerPoint2Impress },
{ Impress, &SvtFilterOptions::IsImpress2PowerPoint,
&SvtFilterOptions::SetImpress2PowerPoint },
+ { SmartArt, &SvtFilterOptions::IsSmartArt2Shape,
+ &SvtFilterOptions::SetSmartArt2Shape },
{ InvalidCBEntry, 0, 0 }
};
@@ -238,6 +242,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
InsertEntry( sChgToFromCalc, static_cast< sal_IntPtr >( Calc ) );
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
InsertEntry( sChgToFromImpress, static_cast< sal_IntPtr >( Impress ) );
+ InsertEntry( sChgToFromSmartArt, static_cast< sal_IntPtr >( SmartArt ), true, false );
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
@@ -251,6 +256,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
{ Calc, &SvtFilterOptions::IsCalc2Excel },
{ Impress, &SvtFilterOptions::IsPowerPoint2Impress },
{ Impress, &SvtFilterOptions::IsImpress2PowerPoint },
+ { SmartArt, &SvtFilterOptions::IsSmartArt2Shape },
{ InvalidCBEntry, NULL }
};
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index a81d5c698378..7ae67214cbc3 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -79,7 +79,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
OUString sChgToFromMath,
sChgToFromWriter,
sChgToFromCalc,
- sChgToFromImpress;
+ sChgToFromImpress,
+ sChgToFromSmartArt;
SvLBoxButtonData* pCheckButtonData;
OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 628b26df8b57..41b378c05342 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -43,5 +43,9 @@ String RID_SVXSTR_CHG_IMPRESS
{
Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse";
};
+String RID_SVXSTR_CHG_SMARTART
+{
+ Text [ en-US ] = "SmartArt to %PRODUCTNAME shapes or reverse";
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */