[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk i18npool/source sd/uiconfig
Ariel Constenla-Haile
arielch at apache.org
Tue May 14 08:15:16 PDT 2013
cui/UIConfig_cui.mk | 1
cui/source/dialogs/pastedlg.cxx | 56 +--------
cui/source/dialogs/svuidlg.hrc | 14 --
cui/source/dialogs/svuidlg.src | 88 --------------
cui/source/inc/helpid.hrc | 1
cui/source/inc/pastedlg.hxx | 25 ----
cui/uiconfig/ui/pastespecial.ui | 184 ++++++++++++++++++++++++++++++
i18npool/source/localedata/data/gl_ES.xml | 38 +++---
sd/uiconfig/sdraw/ui/pastespecial.ui | 181 -----------------------------
9 files changed, 221 insertions(+), 367 deletions(-)
New commits:
commit 4d8301935d5ccb39e0853d447a02511c0bb76f28
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Tue May 14 00:23:03 2013 +0000
Resolves: #i122306# Remove dot from abbreviate day and month names in Galician
(cherry picked from commit ba12679129efc39834114be8bca835d8a84aacb6)
Change-Id: Ifa216baec3e89578215e868c63a1add446005f4b
Signed-off-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/i18npool/source/localedata/data/gl_ES.xml b/i18npool/source/localedata/data/gl_ES.xml
index 01fe4bd..4b02e59 100644
--- a/i18npool/source/localedata/data/gl_ES.xml
+++ b/i18npool/source/localedata/data/gl_ES.xml
@@ -201,99 +201,99 @@
<DaysOfWeek>
<Day>
<DayID>sun</DayID>
- <DefaultAbbrvName>dom.</DefaultAbbrvName>
+ <DefaultAbbrvName>dom</DefaultAbbrvName>
<DefaultFullName>domingo</DefaultFullName>
</Day>
<Day>
<DayID>mon</DayID>
- <DefaultAbbrvName>lun.</DefaultAbbrvName>
+ <DefaultAbbrvName>lun</DefaultAbbrvName>
<DefaultFullName>luns</DefaultFullName>
</Day>
<Day>
<DayID>tue</DayID>
- <DefaultAbbrvName>mar.</DefaultAbbrvName>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
<DefaultFullName>martes</DefaultFullName>
</Day>
<Day>
<DayID>wed</DayID>
- <DefaultAbbrvName>mér.</DefaultAbbrvName>
+ <DefaultAbbrvName>mér</DefaultAbbrvName>
<DefaultFullName>mércores</DefaultFullName>
</Day>
<Day>
<DayID>thu</DayID>
- <DefaultAbbrvName>xov.</DefaultAbbrvName>
+ <DefaultAbbrvName>xov</DefaultAbbrvName>
<DefaultFullName>xoves</DefaultFullName>
</Day>
<Day>
<DayID>fri</DayID>
- <DefaultAbbrvName>ven.</DefaultAbbrvName>
+ <DefaultAbbrvName>ven</DefaultAbbrvName>
<DefaultFullName>venres</DefaultFullName>
</Day>
<Day>
<DayID>sat</DayID>
- <DefaultAbbrvName>sáb.</DefaultAbbrvName>
+ <DefaultAbbrvName>sáb</DefaultAbbrvName>
<DefaultFullName>sábado</DefaultFullName>
</Day>
</DaysOfWeek>
<MonthsOfYear>
<Month>
<MonthID>jan</MonthID>
- <DefaultAbbrvName>xan.</DefaultAbbrvName>
+ <DefaultAbbrvName>xan</DefaultAbbrvName>
<DefaultFullName>xaneiro</DefaultFullName>
</Month>
<Month>
<MonthID>feb</MonthID>
- <DefaultAbbrvName>feb.</DefaultAbbrvName>
+ <DefaultAbbrvName>feb</DefaultAbbrvName>
<DefaultFullName>febreiro</DefaultFullName>
</Month>
<Month>
<MonthID>mar</MonthID>
- <DefaultAbbrvName>mar.</DefaultAbbrvName>
+ <DefaultAbbrvName>mar</DefaultAbbrvName>
<DefaultFullName>marzo</DefaultFullName>
</Month>
<Month>
<MonthID>apr</MonthID>
- <DefaultAbbrvName>abr.</DefaultAbbrvName>
+ <DefaultAbbrvName>abr</DefaultAbbrvName>
<DefaultFullName>abril</DefaultFullName>
</Month>
<Month>
<MonthID>may</MonthID>
- <DefaultAbbrvName>mai.</DefaultAbbrvName>
+ <DefaultAbbrvName>mai</DefaultAbbrvName>
<DefaultFullName>maio</DefaultFullName>
</Month>
<Month>
<MonthID>jun</MonthID>
- <DefaultAbbrvName>xuñ.</DefaultAbbrvName>
+ <DefaultAbbrvName>xuñ</DefaultAbbrvName>
<DefaultFullName>xuño</DefaultFullName>
</Month>
<Month>
<MonthID>jul</MonthID>
- <DefaultAbbrvName>xul.</DefaultAbbrvName>
+ <DefaultAbbrvName>xul</DefaultAbbrvName>
<DefaultFullName>xullo</DefaultFullName>
</Month>
<Month>
<MonthID>aug</MonthID>
- <DefaultAbbrvName>ago.</DefaultAbbrvName>
+ <DefaultAbbrvName>ago</DefaultAbbrvName>
<DefaultFullName>agosto</DefaultFullName>
</Month>
<Month>
<MonthID>sep</MonthID>
- <DefaultAbbrvName>set.</DefaultAbbrvName>
+ <DefaultAbbrvName>set</DefaultAbbrvName>
<DefaultFullName>setembro</DefaultFullName>
</Month>
<Month>
<MonthID>oct</MonthID>
- <DefaultAbbrvName>out.</DefaultAbbrvName>
+ <DefaultAbbrvName>out</DefaultAbbrvName>
<DefaultFullName>outubro</DefaultFullName>
</Month>
<Month>
<MonthID>nov</MonthID>
- <DefaultAbbrvName>nov.</DefaultAbbrvName>
+ <DefaultAbbrvName>nov</DefaultAbbrvName>
<DefaultFullName>novembro</DefaultFullName>
</Month>
<Month>
<MonthID>dec</MonthID>
- <DefaultAbbrvName>dec.</DefaultAbbrvName>
+ <DefaultAbbrvName>dec</DefaultAbbrvName>
<DefaultFullName>decembro</DefaultFullName>
</Month>
</MonthsOfYear>
commit 467dc11fbabb5579b4f05fce61d94720a0988df6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 14 14:05:38 2013 +0100
adapt code to use paste special .ui
Change-Id: Iaac28f442aa38dd6610c89ba04ea2d1ccfca35c5
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 327223f..25fbc0c 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optuserpage \
cui/uiconfig/ui/optviewpage \
cui/uiconfig/ui/pageformatpage \
+ cui/uiconfig/ui/pastespecial \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index fd18c1b..795dae4 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -28,7 +28,6 @@
#include <vcl/group.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/msgbox.hxx>
-#include "svuidlg.hrc"
#include <sot/formats.hxx>
#include <sot/stg.hxx>
#include <svtools/sores.hxx>
@@ -37,37 +36,26 @@
#include <dialmgr.hxx>
SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
-
- : ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
- aFtSource( this, CUI_RES( FT_SOURCE ) ),
- aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
- aFlChoice( this, CUI_RES( FL_CHOICE ) ),
- aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
- aOKButton1( this, CUI_RES( 1 ) ),
- aCancelButton1( this, CUI_RES( 1 ) ),
- aHelpButton1( this, CUI_RES( 1 ) )
+ : ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui")
{
- FreeResource();
- SetHelpId( HID_PASTE_DLG );
- SetUniqueId( HID_PASTE_DLG );
+ get(m_pFtObjectSource, "source");
+ get(m_pLbInsertList, "list");
+ get(m_pOKButton, "ok");
- Font aFont = aFtObjectSource.GetFont();
- aFont.SetWeight( WEIGHT_LIGHT );
- aFtObjectSource.SetFont( aFont );
- aOKButton1.Disable();
+ m_pLbInsertList->SetDropDownLineCount(8);
+ m_pLbInsertList->set_width_request(m_pLbInsertList->approximate_char_width() * 32);
+ m_pOKButton->Disable();
ObjectLB().SetSelectHdl( LINK( this, SvPasteObjectDialog, SelectHdl ) );
ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) );
-
- aLbInsertList.SetAccessibleName(aFlChoice.GetText());
}
void SvPasteObjectDialog::SelectObject()
{
if (m_pLbInsertList->GetEntryCount())
{
- aLbInsertList.SelectEntryPos(0);
- SelectHdl( &aLbInsertList );
+ m_pLbInsertList->SelectEntryPos(0);
+ SelectHdl(m_pLbInsertList);
}
}
@@ -75,8 +63,8 @@ IMPL_LINK( SvPasteObjectDialog, SelectHdl, ListBox *, pListBox )
{
(void)pListBox;
- if ( !aOKButton1.IsEnabled() )
- aOKButton1.Enable();
+ if ( !m_pOKButton->IsEnabled() )
+ m_pOKButton->Enable();
return 0;
}
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index 1d06588..704017c 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -32,14 +32,6 @@
#define STR_WAITINGLINK 32028
-#define FL_CHOICE 15
-#define LB_INSERT_LIST 7
-
-#define MD_PASTE_OBJECT 32001
-#define S_OBJECT 1
-#define FT_OBJECT_SOURCE 22
-#define FT_SOURCE 23
-
#define MD_UPDATE_BASELINKS 32002
#define LB_LINKS 30
#define FT_FILES 31
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 19d7dad..d8c0194 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -20,60 +20,6 @@
#include <svtools/controldims.hrc>
#include "svuidlg.hrc"
-ModalDialog MD_PASTE_OBJECT
-{
- HelpID = "cui:ModalDialog:MD_PASTE_OBJECT";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Size = MAP_APPFONT ( 282 , 135 ) ; // 12 under listbox
- Text [ en-US ] = "Paste Special" ;
- FixedText FT_SOURCE
- {
- Pos = MAP_APPFONT ( 6 , 11 ) ;
- Size = MAP_APPFONT ( 30 , 10 ) ;
- Text [ en-US ] = "Source:" ;
- };
- FixedText FT_OBJECT_SOURCE
- {
- Pos = MAP_APPFONT ( 42 , 11 ) ;
- Size = MAP_APPFONT ( 166 , 20 ) ;
- WordBreak = TRUE ;
- };
- ListBox LB_INSERT_LIST
- {
- HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 49 ) ;
- Size = MAP_APPFONT ( 202 , 74 ) ;
- };
- FixedLine FL_CHOICE
- {
- Pos = MAP_APPFONT ( 6 , 38 ) ;
- Size = MAP_APPFONT ( 214 , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Selection" ;
- };
- OKButton 1
- {
- Pos = MAP_APPFONT ( 226 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT ( 226 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton 1
- {
- Pos = MAP_APPFONT ( 226 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- String S_OBJECT
- {
- Text [ en-US ] = "Object" ;
- };
-};
ModalDialog MD_UPDATE_BASELINKS
{
HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS";
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index f3b95fd..c2cd4a9 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -285,7 +285,6 @@
#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
-#define HID_PASTE_DLG "CUI_HID_PASTE_DLG"
#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT"
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index f5366e0..30be129 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -39,19 +39,15 @@ class TransferableDataHelper;
class SvPasteObjectDialog : public ModalDialog
{
- FixedText aFtSource;
- FixedText aFtObjectSource;
- FixedLine aFlChoice;
- ListBox aLbInsertList;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- HelpButton aHelpButton1;
+ FixedText* m_pFtObjectSource;
+ ListBox* m_pLbInsertList;
+ OKButton* m_pOKButton;
::std::map< SotFormatStringId, String > aSupplementMap;
SvGlobalName aObjClassName;
String aObjName;
- ListBox& ObjectLB() { return aLbInsertList; }
- FixedText& ObjectSource() { return aFtObjectSource; }
+ ListBox& ObjectLB() { return *m_pLbInsertList; }
+ FixedText& ObjectSource() { return *m_pFtObjectSource; }
void SelectObject();
DECL_LINK( SelectHdl, ListBox * );
diff --git a/sd/uiconfig/sdraw/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui
similarity index 92%
rename from sd/uiconfig/sdraw/ui/pastespecial.ui
rename to cui/uiconfig/ui/pastespecial.ui
index 6d5f04a..fb08b9e 100644
--- a/sd/uiconfig/sdraw/ui/pastespecial.ui
+++ b/cui/uiconfig/ui/pastespecial.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="PasteSpecial">
+ <object class="GtkDialog" id="PasteSpecialDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Paste Special</property>
@@ -23,7 +23,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -38,7 +37,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -53,7 +51,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -74,11 +71,15 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -92,10 +93,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="source">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">label</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -134,9 +135,11 @@
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="treeview">
+ <object class="GtkTreeView" id="list">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection"/>
</child>
@@ -150,7 +153,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Selection:</property>
+ <property name="label" translatable="yes">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
commit 55fe8bf2e76074a0144c0b846baddeff1a9ee6ce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 14 14:28:58 2013 +0100
IconBox checkbox is always hidden and always disabled
Change-Id: I4aad1568501e4ecb2758c19ee62f78388abb6fcf
Change icon button is always hidden, and hooked to nothing
Change-Id: I8b8e290908223467b76b0a861a8285e9a87e9fe4
ShouldLink never called...
so bLink is never used
so the always hidden aRbPasteLink is unneccessary
Change-Id: Ic48c9856a8750706262c883a079e0374fc9bb59c
GetAspect never called...
so nAspect is unnecessary,
so SetDefault becomes a no-op and unnecessary
Change-Id: I4a2d0af2eae2a822ecc2d71c84b26b8a2a2de210
aRbPaste is always hidden
Change-Id: I2b1c6eefee5dada29ad5952010b7121e5bcadcde
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index a299791..fd18c1b 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -41,10 +41,6 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
: ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
aFtSource( this, CUI_RES( FT_SOURCE ) ),
aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
- aRbPaste( this, CUI_RES( RB_PASTE ) ),
- aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ),
- aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ),
- aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ),
aFlChoice( this, CUI_RES( FL_CHOICE ) ),
aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
aOKButton1( this, CUI_RES( 1 ) ),
@@ -62,15 +58,13 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
ObjectLB().SetSelectHdl( LINK( this, SvPasteObjectDialog, SelectHdl ) );
ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) );
- SetDefault();
aLbInsertList.SetAccessibleName(aFlChoice.GetText());
}
void SvPasteObjectDialog::SelectObject()
{
- if ( aLbInsertList.GetEntryCount() &&
- !aRbPaste.IsVisible() && !aRbPasteLink.IsVisible() )
+ if (m_pLbInsertList->GetEntryCount())
{
aLbInsertList.SelectEntryPos(0);
SelectHdl( &aLbInsertList );
@@ -95,12 +89,6 @@ IMPL_LINK_INLINE_START( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox
}
IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
-void SvPasteObjectDialog::SetDefault()
-{
- bLink = sal_False;
- nAspect = (sal_uInt16)::com::sun::star::embed::Aspects::MSOLE_CONTENT;
-}
-
SvPasteObjectDialog::~SvPasteObjectDialog()
{
}
@@ -177,7 +165,6 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
}
else if( SOT_FORMATSTR_ID_LINK_SOURCE == nFormat )
{
- PasteLink().Enable();
continue;
}
else if( !aName.Len() )
@@ -221,15 +208,8 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
ObjectSource().SetText( aTypeName );
- SetDefault();
-
if( Dialog::Execute() == RET_OK )
{
- bLink = PasteLink().IsChecked();
-
- if( AsIconBox().IsChecked() )
- nAspect = (sal_uInt16)com::sun::star::embed::Aspects::MSOLE_ICON;
-
nSelFormat = (sal_uLong)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() );
}
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index f15e35c..1d06588 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -22,10 +22,6 @@
#define TB_LINKS 32014
-// gemeinsame Id's
-#define CB_DISPLAY_AS_ICON 12
-#define PB_CHANGE_ICON 14
-
#define STR_AUTOLINK 32006
#define STR_MANUALLINK 32007
#define STR_BROKENLINK 32008
@@ -41,8 +37,6 @@
#define MD_PASTE_OBJECT 32001
#define S_OBJECT 1
-#define RB_PASTE 20
-#define RB_PASTE_LINK 21
#define FT_OBJECT_SOURCE 22
#define FT_SOURCE 23
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index ad739fc..19d7dad 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -40,23 +40,6 @@ ModalDialog MD_PASTE_OBJECT
Size = MAP_APPFONT ( 166 , 20 ) ;
WordBreak = TRUE ;
};
- RadioButton RB_PASTE
- {
- HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 48 ) ;
- Size = MAP_APPFONT ( 63 , 10 ) ;
- Text [ en-US ] = "~Insert as" ;
- Check = TRUE ;
- };
- RadioButton RB_PASTE_LINK
- {
- HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 78 , 48 ) ;
- Size = MAP_APPFONT ( 63 , 10 ) ;
- Text [ en-US ] = "Link to" ;
- };
ListBox LB_INSERT_LIST
{
HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST";
@@ -64,23 +47,6 @@ ModalDialog MD_PASTE_OBJECT
Pos = MAP_APPFONT ( 12 , 49 ) ;
Size = MAP_APPFONT ( 202 , 74 ) ;
};
- CheckBox CB_DISPLAY_AS_ICON
- {
- HelpID = "cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON";
- Hide = TRUE ;
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 150 , 62 ) ;
- Size = MAP_APPFONT ( 64 , 10 ) ;
- Text [ en-US ] = "~As icon" ;
- };
- PushButton PB_CHANGE_ICON
- {
- HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 150 , 111 ) ;
- Size = MAP_APPFONT ( 64 , 14 ) ;
- Text [ en-US ] = "~Other Icon..." ;
- };
FixedLine FL_CHOICE
{
Pos = MAP_APPFONT ( 6 , 38 ) ;
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index e4d020f..f5366e0 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -41,10 +41,6 @@ class SvPasteObjectDialog : public ModalDialog
{
FixedText aFtSource;
FixedText aFtObjectSource;
- RadioButton aRbPaste;
- RadioButton aRbPasteLink;
- CheckBox aCbDisplayAsIcon;
- PushButton aPbChangeIcon;
FixedLine aFlChoice;
ListBox aLbInsertList;
OKButton aOKButton1;
@@ -53,20 +49,13 @@ class SvPasteObjectDialog : public ModalDialog
::std::map< SotFormatStringId, String > aSupplementMap;
SvGlobalName aObjClassName;
String aObjName;
- sal_uInt16 nAspect;
- sal_Bool bLink;
ListBox& ObjectLB() { return aLbInsertList; }
FixedText& ObjectSource() { return aFtObjectSource; }
- RadioButton& PasteLink() { return aRbPasteLink; }
- CheckBox& AsIconBox() { return aCbDisplayAsIcon; }
void SelectObject();
DECL_LINK( SelectHdl, ListBox * );
DECL_LINK( DoubleClickHdl, ListBox * );
- void SetDefault();
- sal_uInt16 GetAspect() const { return nAspect; }
- sal_Bool ShouldLink() const { return bLink; }
public:
SvPasteObjectDialog( Window* pParent );
More information about the Libreoffice-commits
mailing list