[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sfx2/uiconfig sfx2/UI_sfx.mk svtools/inc svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 18 02:46:14 PST 2012
sfx2/UI_sfx.mk | 1
sfx2/inc/sfx2/dinfdlg.hxx | 14 +--
sfx2/source/dialog/dinfdlg.cxx | 106 +++++++++++--------------
sfx2/source/dialog/dinfdlg.hrc | 8 -
sfx2/source/dialog/dinfdlg.src | 72 -----------------
sfx2/source/inc/helpid.hrc | 1
sfx2/uiconfig/ui/documentinfopage.ui | 2
sfx2/uiconfig/ui/documentproperties.ui | 117 ----------------------------
svtools/inc/svtools/svmedit.hxx | 8 -
svx/source/dialog/compressgraphicdialog.cxx | 8 -
10 files changed, 60 insertions(+), 277 deletions(-)
New commits:
commit 4dd309ed472f4860ed60ccdd38226c3fcbdfb59d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 18 10:26:21 2012 +0000
remove manual entry of 50 to 600 now that we support items in .ui
Change-Id: I68e5547916af4986dfab31aac9e25cc8fad8d0e0
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 7232936..1709ea4 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -65,14 +65,6 @@ void CompressGraphicsDialog::Initialize()
get(m_pBtnCalculate, "calculate");
get(m_pInterpolationCombo, "interpolation-method-combo");
- m_pResolutionLB->InsertEntry(OUString("50"));
- m_pResolutionLB->InsertEntry(OUString("75"));
- m_pResolutionLB->InsertEntry(OUString("96"));
- m_pResolutionLB->InsertEntry(OUString("150"));
- m_pResolutionLB->InsertEntry(OUString("200"));
- m_pResolutionLB->InsertEntry(OUString("300"));
- m_pResolutionLB->InsertEntry(OUString("600"));
-
m_pInterpolationCombo->SelectEntry( OUString("Lanczos") );
m_pMFNewWidth->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewWidthModifiedHdl ));
commit 6154e1b4e9c39adac57b0131ceee3a6d2be86fa9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 18 09:04:43 2012 +0000
split out description info page and convert to .ui
Change-Id: I502a51018f7281c9e4bc42d6f9ae76e6cd6a3d86
diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
index 917926f..9505cdf 100644
--- a/sfx2/UI_sfx.mk
+++ b/sfx2/UI_sfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,sfx))
$(eval $(call gb_UI_add_uifiles,sfx,\
sfx2/uiconfig/ui/checkin \
+ sfx2/uiconfig/ui/descriptioninfopage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/password \
sfx2/uiconfig/ui/printeroptionsdialog \
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index b5147ec..09b7a1f 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -214,15 +214,11 @@ public:
class SfxDocumentDescPage : public SfxTabPage
{
private:
- FixedText aTitleFt;
- Edit aTitleEd;
- FixedText aThemaFt;
- Edit aThemaEd;
- FixedText aKeywordsFt;
- Edit aKeywordsEd;
- FixedText aCommentFt;
- MultiLineEdit aCommentEd;
- SfxDocumentInfoItem* pInfoItem;
+ Edit* m_pTitleEd;
+ Edit* m_pThemaEd;
+ Edit* m_pKeywordsEd;
+ VclMultiLineEdit* m_pCommentEd;
+ SfxDocumentInfoItem* m_pInfoItem;
protected:
SfxDocumentDescPage( Window* pParent, const SfxItemSet& );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b147e87..775baff 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -616,23 +616,15 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
}
//------------------------------------------------------------------------
-SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet ) :
-
- SfxTabPage( pParent, SfxResId( TP_DOCINFODESC ), rItemSet ),
-
- aTitleFt ( this, SfxResId( FT_TITLE ) ),
- aTitleEd ( this, SfxResId( ED_TITLE ) ),
- aThemaFt ( this, SfxResId( FT_THEMA ) ),
- aThemaEd ( this, SfxResId( ED_THEMA ) ),
- aKeywordsFt ( this, SfxResId( FT_KEYWORDS ) ),
- aKeywordsEd ( this, SfxResId( ED_KEYWORDS ) ),
- aCommentFt ( this, SfxResId( FT_COMMENT ) ),
- aCommentEd ( this, SfxResId( ED_COMMENT ) ),
-
- pInfoItem ( NULL )
+SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet )
+ : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", rItemSet)
+ , m_pInfoItem ( NULL )
{
- FreeResource();
+ get(m_pTitleEd, "title");
+ get(m_pThemaEd, "subject");
+ get(m_pKeywordsEd, "keywords");
+ get(m_pCommentEd, "comments");
}
//------------------------------------------------------------------------
@@ -645,10 +637,10 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem
sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
{
// Test whether a change is present
- const sal_Bool bTitleMod = aTitleEd.IsModified();
- const sal_Bool bThemeMod = aThemaEd.IsModified();
- const sal_Bool bKeywordsMod = aKeywordsEd.IsModified();
- const sal_Bool bCommentMod = aCommentEd.IsModified();
+ const sal_Bool bTitleMod = m_pTitleEd->IsModified();
+ const sal_Bool bThemeMod = m_pThemaEd->IsModified();
+ const sal_Bool bKeywordsMod = m_pKeywordsEd->IsModified();
+ const sal_Bool bCommentMod = m_pCommentEd->IsModified();
if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
{
return sal_False;
@@ -664,7 +656,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
pExSet = pDlg->GetExampleSet();
if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
- pInfo = pInfoItem;
+ pInfo = m_pInfoItem;
else if ( pItem )
pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem *)pItem );
@@ -676,22 +668,22 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
if ( bTitleMod )
{
- pInfo->setTitle( aTitleEd.GetText() );
+ pInfo->setTitle( m_pTitleEd->GetText() );
}
if ( bThemeMod )
{
- pInfo->setSubject( aThemaEd.GetText() );
+ pInfo->setSubject( m_pThemaEd->GetText() );
}
if ( bKeywordsMod )
{
- pInfo->setKeywords( aKeywordsEd.GetText() );
+ pInfo->setKeywords( m_pKeywordsEd->GetText() );
}
if ( bCommentMod )
{
- pInfo->setDescription( aCommentEd.GetText() );
+ pInfo->setDescription( m_pCommentEd->GetText() );
}
rSet.Put( SfxDocumentInfoItem( *pInfo ) );
- if ( pInfo != pInfoItem )
+ if ( pInfo != m_pInfoItem )
{
delete pInfo;
}
@@ -702,20 +694,20 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
//------------------------------------------------------------------------
void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
{
- pInfoItem = &(SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO);
+ m_pInfoItem = &(SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO);
- aTitleEd.SetText( pInfoItem->getTitle() );
- aThemaEd.SetText( pInfoItem->getSubject() );
- aKeywordsEd.SetText( pInfoItem->getKeywords() );
- aCommentEd.SetText( pInfoItem->getDescription() );
+ m_pTitleEd->SetText( m_pInfoItem->getTitle() );
+ m_pThemaEd->SetText( m_pInfoItem->getSubject() );
+ m_pKeywordsEd->SetText( m_pInfoItem->getKeywords() );
+ m_pCommentEd->SetText( m_pInfoItem->getDescription() );
SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
if ( pROItem && pROItem->GetValue() )
{
- aTitleEd.SetReadOnly( sal_True );
- aThemaEd.SetReadOnly( sal_True );
- aKeywordsEd.SetReadOnly( sal_True );
- aCommentEd.SetReadOnly( sal_True );
+ m_pTitleEd->SetReadOnly( sal_True );
+ m_pThemaEd->SetReadOnly( sal_True );
+ m_pKeywordsEd->SetReadOnly( sal_True );
+ m_pCommentEd->SetReadOnly( sal_True );
}
}
@@ -946,10 +938,10 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
{
- SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
+ SfxDocumentInfoItem* m_pInfoItem = (SfxDocumentInfoItem*)pItem;
sal_Bool bUseData = ( STATE_CHECK == m_pUseUserDataCB->GetState() );
- pInfoItem->SetUseUserData( bUseData );
- rSet.Put( SfxDocumentInfoItem( *pInfoItem ) );
+ m_pInfoItem->SetUseUserData( bUseData );
+ rSet.Put( SfxDocumentInfoItem( *m_pInfoItem ) );
bRet = sal_True;
}
}
@@ -960,13 +952,13 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
const SfxPoolItem* pItem;
if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
{
- SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
+ SfxDocumentInfoItem* m_pInfoItem = (SfxDocumentInfoItem*)pItem;
sal_Bool bUseAuthor = bEnableUseUserData && m_pUseUserDataCB->IsChecked();
- SfxDocumentInfoItem newItem( *pInfoItem );
+ SfxDocumentInfoItem newItem( *m_pInfoItem );
newItem.resetUserData( bUseAuthor
? SvtUserOptions().GetFullName()
: ::rtl::OUString() );
- pInfoItem->SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() );
+ m_pInfoItem->SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() );
newItem.SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() );
newItem.SetDeleteUserData( sal_True );
@@ -995,12 +987,12 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
void SfxDocumentPage::Reset( const SfxItemSet& rSet )
{
// Determine the document information
- const SfxDocumentInfoItem *pInfoItem =
+ const SfxDocumentInfoItem *m_pInfoItem =
&(const SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO);
// template data
- if ( pInfoItem->HasTemplate() )
- m_pTemplValFt->SetText( pInfoItem->getTemplateName() );
+ if ( m_pInfoItem->HasTemplate() )
+ m_pTemplValFt->SetText( m_pInfoItem->getTemplateName() );
else
{
m_pTemplFt->Hide();
@@ -1008,7 +1000,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
}
// determine file name
- String aFile( pInfoItem->GetValue() );
+ String aFile( m_pInfoItem->GetValue() );
String aFactory( aFile );
if ( aFile.Len() > 2 && aFile.GetChar(0) == '[' )
{
@@ -1077,25 +1069,25 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
m_pFileValFt->SetText( aURL.GetPartBeforeLastName() );
// handle access data
- sal_Bool m_bUseUserData = pInfoItem->IsUseUserData();
+ sal_Bool m_bUseUserData = m_pInfoItem->IsUseUserData();
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
- m_pCreateValFt->SetText( ConvertDateTime_Impl( pInfoItem->getAuthor(),
- pInfoItem->getCreationDate(), rLocaleWrapper ) );
- util::DateTime aTime( pInfoItem->getModificationDate() );
+ m_pCreateValFt->SetText( ConvertDateTime_Impl( m_pInfoItem->getAuthor(),
+ m_pInfoItem->getCreationDate(), rLocaleWrapper ) );
+ util::DateTime aTime( m_pInfoItem->getModificationDate() );
if ( aTime.Month > 0 )
m_pChangeValFt->SetText( ConvertDateTime_Impl(
- pInfoItem->getModifiedBy(), aTime, rLocaleWrapper ) );
- aTime = pInfoItem->getPrintDate();
+ m_pInfoItem->getModifiedBy(), aTime, rLocaleWrapper ) );
+ aTime = m_pInfoItem->getPrintDate();
if ( aTime.Month > 0 )
- m_pPrintValFt->SetText( ConvertDateTime_Impl( pInfoItem->getPrintedBy(),
+ m_pPrintValFt->SetText( ConvertDateTime_Impl( m_pInfoItem->getPrintedBy(),
aTime, rLocaleWrapper ) );
- const long nTime = pInfoItem->getEditingDuration();
+ const long nTime = m_pInfoItem->getEditingDuration();
if ( m_bUseUserData )
{
const Time aT( nTime/3600, (nTime%3600)/60, nTime%60 );
m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aT ) );
m_pDocNoValFt->SetText( String::CreateFromInt32(
- pInfoItem->getEditingCycles() ) );
+ m_pInfoItem->getEditingCycles() ) );
}
TriState eState = (TriState)m_bUseUserData;
@@ -1462,7 +1454,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
{
FreeResource();
- const SfxDocumentInfoItem* pInfoItem =
+ const SfxDocumentInfoItem* m_pInfoItem =
&(const SfxDocumentInfoItem &)rItemSet.Get( SID_DOCINFO );
#ifdef DBG_UTIL
@@ -1477,7 +1469,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
rItemSet.GetItemState( SID_EXPLORER_PROPS_START, sal_False, &pItem ) )
{
// File name
- String aFile( pInfoItem->GetValue() );
+ String aFile( m_pInfoItem->GetValue() );
INetURLObject aURL;
aURL.SetSmartProtocol( INET_PROT_FILE );
@@ -2347,8 +2339,8 @@ sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
void SfxCustomPropertiesPage::Reset( const SfxItemSet& rItemSet )
{
m_aPropertiesCtrl.ClearAllLines();
- const SfxDocumentInfoItem* pInfoItem = &(const SfxDocumentInfoItem &)rItemSet.Get(SID_DOCINFO);
- std::vector< CustomProperty* > aCustomProps = pInfoItem->GetCustomProperties();
+ const SfxDocumentInfoItem* m_pInfoItem = &(const SfxDocumentInfoItem &)rItemSet.Get(SID_DOCINFO);
+ std::vector< CustomProperty* > aCustomProps = m_pInfoItem->GetCustomProperties();
for ( sal_uInt32 i = 0; i < aCustomProps.size(); i++ )
{
m_aPropertiesCtrl.AddLine( aCustomProps[i]->m_sName, aCustomProps[i]->m_aValue, false );
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index 913f983..4d596a7 100644
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.hrc
@@ -58,12 +58,6 @@
// defines ---------------------------------------------------------------
-#define FT_TITLE 9
-#define ED_TITLE 10
-#define FT_THEMA 11
-#define ED_THEMA 12
-#define FT_KEYWORDS 13
-#define ED_KEYWORDS 14
#define FT_INFO1 15
#define ED_INFO1 16
#define FT_INFO2 17
@@ -72,8 +66,6 @@
#define ED_INFO3 20
#define FT_INFO4 21
#define ED_INFO4 22
-#define FT_COMMENT 23
-#define ED_COMMENT 24
#define BTN_EDITLABEL 34
#define FT_URL 43
#define ED_URL 44
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 2d8c80d..e0630af 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -29,78 +29,6 @@ String STR_SFX_NEWOFFICEDOC
Text [ en-US ] = "%PRODUCTNAME document" ;
};
-TabPage TP_DOCINFODESC
-{
- HelpId = HID_DOCINFODESC ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedText FT_TITLE
- {
- Pos = MAP_APPFONT ( 6 , 7 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Title" ;
- };
- Edit ED_TITLE
- {
- HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_TITLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 6 ) ;
- Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- };
- FixedText FT_THEMA
- {
- Pos = MAP_APPFONT ( 6 , 22 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Subject" ;
- };
- Edit ED_THEMA
- {
- HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_THEMA";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 21 ) ;
- Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- };
- FixedText FT_KEYWORDS
- {
- Pos = MAP_APPFONT ( 6 , 37 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Keywords" ;
- };
- Edit ED_KEYWORDS
- {
- HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 36 ) ;
- Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- };
- FixedText FT_COMMENT
- {
- Pos = MAP_APPFONT ( 6 , 52 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Comments" ;
- };
- MultiLineEdit ED_COMMENT
- {
- HelpID = "sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 51 ) ;
- Size = MAP_APPFONT ( 184 , 128 ) ;
- IgnoreTab = TRUE ;
- Left = TRUE ;
- VScroll = TRUE ;
- };
-};
-
// TP_DOCINFOUSER --------------------------------------------------------
TabPage TP_DOCINFOUSER
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 74e2753..22b3a27 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -26,7 +26,6 @@
#define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR"
#define HID_MANAGE_STYLES "SFX2_HID_MANAGE_STYLES"
#define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT"
-#define HID_DOCINFODESC "SFX2_HID_DOCINFODESC"
#define HID_DOCINFOUSER "SFX2_HID_DOCINFOUSER"
#define HID_DOCINFORELOAD "SFX2_HID_DOCINFORELOAD"
#define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL"
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index e9ce33c..47db29d 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -6,7 +6,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">18</property>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
diff --git a/sfx2/uiconfig/ui/documentproperties.ui b/sfx2/uiconfig/ui/documentproperties.ui
index e4fb9da..60030e8 100644
--- a/sfx2/uiconfig/ui/documentproperties.ui
+++ b/sfx2/uiconfig/ui/documentproperties.ui
@@ -26,122 +26,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">30</property>
- <child>
- <object class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Title </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Subject </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Keywords </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Comments </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="label2">
diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index 0f75cfe..e6e4f0b 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.hxx
@@ -31,12 +31,10 @@
class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit
{
public:
- MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
- MultiLineEdit( Window* pParent, const ResId& rResId );
- ~MultiLineEdit(){};
+ MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
+ MultiLineEdit( Window* pParent, const ResId& rResId );
- virtual
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
GetComponentInterface(sal_Bool bCreate = sal_True);
};
More information about the Libreoffice-commits
mailing list