[Libreoffice-commits] .: 10 commits - desktop/source desktop/uiconfig desktop/UI_deployment.mk desktop/util filter/source helpcontent2 oox/source sal/inc sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UI_scalc.mk sot/inc sot/source svtools/inc svtools/source sw/qa tools/inc tools/source unusedcode.easy vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 17 12:11:55 PST 2012
desktop/UI_deployment.mk | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2
desktop/source/inc/helpid.hrc | 5
desktop/uiconfig/ui/ExtensionManager.ui | 304 -------------------
desktop/uiconfig/ui/extensionmanager.ui | 304 +++++++++++++++++++
desktop/util/hidother.src | 5
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 4
helpcontent2 | 2
oox/source/core/filterbase.cxx | 3
sal/inc/rtl/ustring.hxx | 3
sc/AllLangResTarget_sc.mk | 1
sc/UI_scalc.mk | 1
sc/inc/sc.hrc | 2
sc/inc/scabstdlg.hxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 17 -
sc/source/ui/attrdlg/scdlgfact.hxx | 2
sc/source/ui/dbgui/textimportoptions.cxx | 55 +--
sc/source/ui/dbgui/textimportoptions.src | 102 ------
sc/source/ui/inc/textimportoptions.hrc | 30 -
sc/source/ui/inc/textimportoptions.hxx | 16 -
sc/source/ui/unoobj/filtuno.cxx | 4
sc/source/ui/view/viewfun5.cxx | 4
sc/uiconfig/scalc/ui/textimportoptions.ui | 227 ++++++++++++++
sot/inc/sot/stg.hxx | 1
sot/source/sdstor/ucbstorage.cxx | 27 -
svtools/inc/svtools/treelistentry.hxx | 3
svtools/source/contnr/treelistentry.cxx | 10
sw/qa/extras/rtfexport/rtfexport.cxx | 7
sw/qa/extras/rtfimport/rtfimport.cxx | 7
tools/inc/tools/inetmime.hxx | 3
tools/source/inet/inetmime.cxx | 31 -
unusedcode.easy | 5
vcl/inc/vcl/layout.hxx | 22 +
vcl/source/window/brdwin.cxx | 6
vcl/source/window/layout.cxx | 122 ++++---
35 files changed, 679 insertions(+), 662 deletions(-)
New commits:
commit fd4f65e9524c71b4ad2a800b7b16de9bb51230b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 17 13:13:31 2012 +0000
valgrind: use of uninitialized variable
Change-Id: I57de2d1ab4597cf3ef9eae08dfdbda1d5abff621
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 2749e18..00892db 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -166,6 +166,7 @@ struct FilterBaseImpl
FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
meDirection( FILTERDIRECTION_UNKNOWN ),
+ meVersion( ECMA_DIALECT ),
mxComponentContext( rxContext, UNO_SET_THROW ),
mxComponentFactory( rxContext->getServiceManager(), UNO_SET_THROW ),
mxServiceFactory( rxContext->getServiceManager(), UNO_QUERY_THROW )
@@ -562,7 +563,7 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
sal_Int32 nVersion = aProps.getUnpackedValueOrDefault( CREATE_OUSTRING( "FileFormatVersion" ), sal_Int32( 0 ) );
mxImpl->meVersion = OoxmlVersion( nVersion );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
// Not ISO OOXML
}
commit fe0ed1e8bbc0cf8d0957474dcbd42b7153adb09b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 16 14:16:03 2012 +0000
valgrind: rtl_ustr_asciil_reverseEquals_WithLength is a death trap
Change-Id: If5c4c0b59aa91ec3775e2c15c4edb57bd7ac9aa7
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 2489e3c..39ddb49 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -903,7 +903,8 @@ public:
template< typename T >
typename internal::ConstCharArrayDetector< T, bool >::Type startsWith( T& literal ) const
{
- return rtl_ustr_asciil_reverseEquals_WithLength( pData->buffer, literal,
+ return internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
+ && rtl_ustr_asciil_reverseEquals_WithLength( pData->buffer, literal,
internal::ConstCharArrayDetector< T, void >::size - 1);
}
commit c8383757fb031b2211cb6d1fdec7ac9045e72916
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 16 14:00:10 2012 +0000
valgrind: Invalid read from sequence released during assignation
Change-Id: I3bb665e15e6f4ae7ada94a33a58633bd548d34f4
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 9601471..de5bfe6 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -412,16 +412,17 @@ void Test::testFdo53113()
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aProps = getProperty< uno::Sequence<beans::PropertyValue> >(xDraws->getByIndex(0), "CustomShapeGeometry");
+ uno::Sequence<beans::PropertyValue> aPathProps;
for (int i = 0; i < aProps.getLength(); ++i)
{
const beans::PropertyValue& rProp = aProps[i];
if (rProp.Name == "Path")
- rProp.Value >>= aProps;
+ rProp.Value >>= aPathProps;
}
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aPairs;
- for (int i = 0; i < aProps.getLength(); ++i)
+ for (int i = 0; i < aPathProps.getLength(); ++i)
{
- const beans::PropertyValue& rProp = aProps[i];
+ const beans::PropertyValue& rProp = aPathProps[i];
if (rProp.Name == "Coordinates")
rProp.Value >>= aPairs;
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index c24c87a..c8eec60 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -775,16 +775,17 @@ void Test::testInk()
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aProps = getProperty< uno::Sequence<beans::PropertyValue> >(xDraws->getByIndex(0), "CustomShapeGeometry");
+ uno::Sequence<beans::PropertyValue> aPathProps;
for (int i = 0; i < aProps.getLength(); ++i)
{
const beans::PropertyValue& rProp = aProps[i];
if (rProp.Name == "Path")
- rProp.Value >>= aProps;
+ rProp.Value >>= aPathProps;
}
uno::Sequence<drawing::EnhancedCustomShapeSegment> aSegments;
- for (int i = 0; i < aProps.getLength(); ++i)
+ for (int i = 0; i < aPathProps.getLength(); ++i)
{
- const beans::PropertyValue& rProp = aProps[i];
+ const beans::PropertyValue& rProp = aPathProps[i];
if (rProp.Name == "Segments")
rProp.Value >>= aSegments;
}
commit aa2f6cf0012214953c72b3b37bdde560ced2430b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 16 10:36:21 2012 +0000
valgrind: use of unitialized variables
Change-Id: I42ef4af662bbfd792e9d98aba5b5e272fa4d8091
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 5de8938..34ae191 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1064,8 +1064,12 @@ void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point*
// =======================================================================
ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow )
+ : mpBorderWindow(pBorderWindow)
+ , mnLeftBorder(0)
+ , mnTopBorder(0)
+ , mnRightBorder(0)
+ , mnBottomBorder(0)
{
- mpBorderWindow = pBorderWindow;
}
// -----------------------------------------------------------------------
commit 91672c8b9d346390f854ddf3fa3c2fdb681ceaff
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 15 20:59:42 2012 +0000
accessible names set *after* resource was freed, so names were null
I've seen so many of these accessible resources in the wrong place
or otherwise broken that I wonder if any of that is really working.
We can eventually move all this foo into the .ui format and implement the
accessiblilty stuff in the builder
Change-Id: I82e87df05d5cd3777ed5ab8b83c424ff759124e9
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index bc4c31c..64f1baa 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -74,8 +74,6 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResM
sTemplatePath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/template/") ),
sDocTypePrefix( RTL_CONSTASCII_USTRINGPARAM( "doctype:") )
{
- FreeResource();
-
mpResMgr = &rResMgr;
mpFilterListBox = new XMLFilterListBox( &maCtrlFilterList );
@@ -86,6 +84,8 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResM
maCtrlFilterList.SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX));
mpFilterListBox->SetHelpId( HID_XML_FILTER_LIST );
+ FreeResource();
+
maPBNew.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) );
maPBEdit.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) );
maPBTest.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) );
commit e87c9d8497b570b59d471404dada098bb20a0b40
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 15 20:49:14 2012 +0000
drop old help ids not in use anymore
Change-Id: I3acf29ac52a51e688fb41e2c978f458170cd9b12
diff --git a/desktop/UI_deployment.mk b/desktop/UI_deployment.mk
index c06e91f..4aeb42c 100644
--- a/desktop/UI_deployment.mk
+++ b/desktop/UI_deployment.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_UI_UI,desktop))
$(eval $(call gb_UI_add_uifiles,desktop,\
- desktop/uiconfig/ui/ExtensionManager \
+ desktop/uiconfig/ui/extensionmanager \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 25e7c76..e5d284d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -701,7 +701,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
// ExtMgrDialog
//------------------------------------------------------------------------------
ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager)
- : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/ExtensionManager.ui")
+ : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui")
, DialogHelper(pManager->getContext(), (Dialog*) this)
, m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
, m_bHasProgress(false)
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 768c573..11a9102 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -19,11 +19,6 @@
#ifndef INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
-#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX"
-#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS"
-#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL"
-#define HID_PACKAGE_MANAGER_MENU_ITEM "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM"
-
#define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV"
#define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT"
#define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL"
diff --git a/desktop/uiconfig/ui/ExtensionManager.ui b/desktop/uiconfig/ui/ExtensionManager.ui
deleted file mode 100644
index fc33697..0000000
--- a/desktop/uiconfig/ui/ExtensionManager.ui
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="ExtensionManagerDialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Extension Manager</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
- <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>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="add">
- <property name="label" translatable="yes">Add...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="update">
- <property name="label" translatable="yes">Check for updates...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
- <property name="use_action_appearance">False</property>
- <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>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">10</property>
- <child>
- <object class="deploymentgui:ExtBoxWithBtns" id="extensions">
- <property name="width_request">600</property>
- <property name="height_request">320</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="xalign">1</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="shared">
- <property name="label" translatable="yes">Shared</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">center</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</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="GtkCheckButton" id="user">
- <property name="label" translatable="yes">User</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">start</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="bundled">
- <property name="label" translatable="yes">Installation</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</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>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Type of Extension</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="progressft">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="margin_left">50</property>
- <property name="label" translatable="yes">Adding %EXTENSION_NAME</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="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkProgressBar" id="progressbar">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="getextensions">
- <property name="label" translatable="yes">Get more extensions online...</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="use_action_appearance">False</property>
- <property name="relief">none</property>
- <property name="xalign">0</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">help</action-widget>
- <action-widget response="0">add</action-widget>
- <action-widget response="0">update</action-widget>
- <action-widget response="0">close</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui
new file mode 100644
index 0000000..fc33697
--- /dev/null
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="ExtensionManagerDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Extension Manager</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="add">
+ <property name="label" translatable="yes">Add...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="update">
+ <property name="label" translatable="yes">Check for updates...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="deploymentgui:ExtBoxWithBtns" id="extensions">
+ <property name="width_request">600</property>
+ <property name="height_request">320</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">1</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="shared">
+ <property name="label" translatable="yes">Shared</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">center</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</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="GtkCheckButton" id="user">
+ <property name="label" translatable="yes">User</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="bundled">
+ <property name="label" translatable="yes">Installation</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Type of Extension</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="progressft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="margin_left">50</property>
+ <property name="label" translatable="yes">Adding %EXTENSION_NAME</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="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="progressbar">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="getextensions">
+ <property name="label" translatable="yes">Get more extensions online...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">add</action-widget>
+ <action-widget response="0">update</action-widget>
+ <action-widget response="0">close</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src
index f2607b0..0885f9a 100644
--- a/desktop/util/hidother.src
+++ b/desktop/util/hidother.src
@@ -18,11 +18,6 @@
#include "../source/inc/helpid.hrc"
-hidspecial HID_PACKAGE_MANAGER_MENU_ITEM { HelpID = HID_PACKAGE_MANAGER_MENU_ITEM; };
-hidspecial HID_PACKAGE_MANAGER_TREELISTBOX { HelpID = HID_PACKAGE_MANAGER_TREELISTBOX; };
-hidspecial HID_PACKAGE_MANAGER_PROGRESS { HelpID = HID_PACKAGE_MANAGER_PROGRESS; };
-hidspecial HID_PACKAGE_MANAGER_PROGRESS_CANCEL { HelpID = HID_PACKAGE_MANAGER_PROGRESS_CANCEL; };
-
hidspecial HID_PACKAGE_MANAGER_UPD_REQ { HelpID = HID_PACKAGE_MANAGER_UPD_REQ; };
hidspecial HID_FIRSTSTART_PREV { HelpId = HID_FIRSTSTART_PREV;};
diff --git a/helpcontent2 b/helpcontent2
index fa665d0..3a14e89 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fa665d0f817d7446b290a16434411d6af0ad6f91
+Subproject commit 3a14e891235b0c8eb7f8572a2ed9ea3181536629
commit 052a6a99e65a152aa9a08708ab89c8971b9b2f0a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 15 20:04:42 2012 +0000
honour child alignment in all layout widgets, not just grid
i.e. so that the original cmis checkin dialog of
207ed1b1a17ca6d785cad936ecadcd160acc2b83
would have worked without rework as grid of
5cc34dc91211b6173139d1a1a76c494c4a1f9a75
Change-Id: Ide047cfca63558867c427d4fcbb91ad182fb71e4
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 853bfb1..04ee7e3 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -33,6 +33,10 @@ public:
//while GetOptimalSize/get_preferred_size and SetPosSizePixel are
//oblivious to them
static Size getLayoutRequisition(const Window &rWindow);
+ static void setLayoutPosSize(Window &rWindow, const Point &rPos, const Size &rSize);
+
+ //applies the allocation pos and size onto rWindow via setLayoutPosSize taking into account
+ //the rWindows alignment desires within that allocation
static void setLayoutAllocation(Window &rWindow, const Point &rPos, const Size &rSize);
protected:
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 4e7b098..a8ebca9 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -25,7 +25,7 @@ Size VclContainer::GetOptimalSize(WindowSizeType eType) const
return calculateRequisition();
}
-void VclContainer::setLayoutAllocation(Window &rWindow, const Point &rPos, const Size &rSize)
+void VclContainer::setLayoutPosSize(Window &rWindow, const Point &rPos, const Size &rSize)
{
sal_Int32 nBorderWidth = rWindow.get_border_width();
sal_Int32 nLeft = rWindow.get_margin_left() + nBorderWidth;
@@ -37,6 +37,67 @@ void VclContainer::setLayoutAllocation(Window &rWindow, const Point &rPos, const
rWindow.SetPosSizePixel(aPos, aSize);
}
+void VclContainer::setLayoutAllocation(Window &rChild, const Point &rAllocPos, const Size &rChildAlloc)
+{
+ VclAlign eHalign = rChild.get_halign();
+ VclAlign eValign = rChild.get_valign();
+
+ //typical case
+ if (eHalign == VCL_ALIGN_FILL && eValign == VCL_ALIGN_FILL)
+ {
+ setLayoutPosSize(rChild, rAllocPos, rChildAlloc);
+ return;
+ }
+
+ Point aChildPos(rAllocPos);
+ Size aChildSize(rChildAlloc);
+ Size aChildPreferredSize(getLayoutRequisition(rChild));
+
+ switch (eHalign)
+ {
+ case VCL_ALIGN_FILL:
+ break;
+ case VCL_ALIGN_START:
+ if (aChildPreferredSize.Width() < rChildAlloc.Width())
+ aChildSize.Width() = aChildPreferredSize.Width();
+ break;
+ case VCL_ALIGN_END:
+ if (aChildPreferredSize.Width() < rChildAlloc.Width())
+ aChildSize.Width() = aChildPreferredSize.Width();
+ aChildPos.X() += rChildAlloc.Width();
+ aChildPos.X() -= aChildSize.Width();
+ break;
+ case VCL_ALIGN_CENTER:
+ if (aChildPreferredSize.Width() < aChildSize.Width())
+ aChildSize.Width() = aChildPreferredSize.Width();
+ aChildPos.X() += (rChildAlloc.Width() - aChildSize.Width()) / 2;
+ break;
+ }
+
+ switch (eValign)
+ {
+ case VCL_ALIGN_FILL:
+ break;
+ case VCL_ALIGN_START:
+ if (aChildPreferredSize.Height() < rChildAlloc.Height())
+ aChildSize.Height() = aChildPreferredSize.Height();
+ break;
+ case VCL_ALIGN_END:
+ if (aChildPreferredSize.Height() < rChildAlloc.Height())
+ aChildSize.Height() = aChildPreferredSize.Height();
+ aChildPos.Y() += rChildAlloc.Height();
+ aChildPos.Y() -= aChildSize.Height();
+ break;
+ case VCL_ALIGN_CENTER:
+ if (aChildPreferredSize.Height() < aChildSize.Height())
+ aChildSize.Height() = aChildPreferredSize.Height();
+ aChildPos.Y() += (rChildAlloc.Height() - aChildSize.Height()) / 2;
+ break;
+ }
+
+ setLayoutPosSize(rChild, aChildPos, aChildSize);
+}
+
Size VclContainer::getLayoutRequisition(const Window &rWindow)
{
sal_Int32 nBorderWidth = rWindow.get_border_width();
@@ -804,60 +865,7 @@ void VclGrid::setAllocation(const Size& rAllocation)
aChildAlloc.Height() += aHeights[y+nSpanY].m_nValue;
aChildAlloc.Height() += get_row_spacing()*(nHeight-1);
- Point aChildPos(aAllocPos);
- Size aChildSize(aChildAlloc);
-
- VclAlign eHalign = pChild->get_halign();
- VclAlign eValign = pChild->get_valign();
-
- Size aChildPreferredSize;
-
- if (eHalign != VCL_ALIGN_FILL || eValign != VCL_ALIGN_FILL)
- aChildPreferredSize = getLayoutRequisition(*pChild);
-
- switch (eHalign)
- {
- case VCL_ALIGN_FILL:
- break;
- case VCL_ALIGN_START:
- if (aChildPreferredSize.Width() < aChildAlloc.Width())
- aChildSize.Width() = aChildPreferredSize.Width();
- break;
- case VCL_ALIGN_END:
- if (aChildPreferredSize.Width() < aChildAlloc.Width())
- aChildSize.Width() = aChildPreferredSize.Width();
- aChildPos.X() += aChildAlloc.Width();
- aChildPos.X() -= aChildSize.Width();
- break;
- case VCL_ALIGN_CENTER:
- if (aChildPreferredSize.Width() < aChildSize.Width())
- aChildSize.Width() = aChildPreferredSize.Width();
- aChildPos.X() += (aChildAlloc.Width() - aChildSize.Width()) / 2;
- break;
- }
-
- switch (eValign)
- {
- case VCL_ALIGN_FILL:
- break;
- case VCL_ALIGN_START:
- if (aChildPreferredSize.Height() < aChildAlloc.Height())
- aChildSize.Height() = aChildPreferredSize.Height();
- break;
- case VCL_ALIGN_END:
- if (aChildPreferredSize.Height() < aChildAlloc.Height())
- aChildSize.Height() = aChildPreferredSize.Height();
- aChildPos.Y() += aChildAlloc.Height();
- aChildPos.Y() -= aChildSize.Height();
- break;
- case VCL_ALIGN_CENTER:
- if (aChildPreferredSize.Height() < aChildSize.Height())
- aChildSize.Height() = aChildPreferredSize.Height();
- aChildPos.Y() += (aChildAlloc.Height() - aChildSize.Height()) / 2;
- break;
- }
-
- setLayoutAllocation(*pChild, aChildPos, aChildSize);
+ setLayoutAllocation(*pChild, aAllocPos, aChildAlloc);
}
aAllocPos.Y() += aHeights[y].m_nValue + get_row_spacing();
}
commit d00ee312b2b499da11752f89d8791e562c7f70b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 15 14:49:37 2012 +0000
honour widget [v|h]expand in VclBox as well as packing expand
Change-Id: I5ccd28c8d9d62d5a7bec118312752f66a9a4d609
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 0e2d65d..853bfb1 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -86,6 +86,8 @@ protected:
virtual void setSecondaryDimension(Size &rSize, long) const = 0;
virtual long getSecondaryCoordinate(const Point &rPos) const = 0;
virtual void setSecondaryCoordinate(Point &rPos, long) const = 0;
+
+ virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const = 0;
};
class VCL_DLLPUBLIC VclVBox : public VclBox
@@ -128,6 +130,10 @@ protected:
{
rPos.setX(nPos);
}
+ virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const
+ {
+ return rWindow.get_expand() || rWindow.get_vexpand();
+ }
};
class VCL_DLLPUBLIC VclHBox : public VclBox
@@ -170,6 +176,10 @@ protected:
{
rPos.setY(nPos);
}
+ virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const
+ {
+ return rWindow.get_expand() || rWindow.get_hexpand();
+ }
};
enum VclButtonBoxStyle
@@ -262,6 +272,10 @@ protected:
{
rPos.setX(nPos);
}
+ virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const
+ {
+ return rWindow.get_expand() || rWindow.get_vexpand();
+ }
};
class VCL_DLLPUBLIC VclHButtonBox : public VclButtonBox
@@ -304,6 +318,10 @@ protected:
{
rPos.setY(nPos);
}
+ virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const
+ {
+ return rWindow.get_expand() || rWindow.get_hexpand();
+ }
};
class VCL_DLLPUBLIC VclGrid : public VclContainer
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index be6cbe4..4e7b098 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -130,7 +130,7 @@ void VclBox::setAllocation(const Size &rAllocation)
if (!pChild->IsVisible())
continue;
++nVisibleChildren;
- bool bExpand = pChild->get_expand();
+ bool bExpand = getPrimaryDimensionChildExpand(*pChild);
if (bExpand)
++nExpandChildren;
}
@@ -181,7 +181,7 @@ void VclBox::setAllocation(const Size &rAllocation)
aBoxSize = getLayoutRequisition(*pChild);
long nPrimaryDimension = getPrimaryDimension(aBoxSize);
nPrimaryDimension += nPadding * 2;
- if (pChild->get_expand())
+ if (getPrimaryDimensionChildExpand(*pChild))
nPrimaryDimension += nExtraSpace;
setPrimaryDimension(aBoxSize, nPrimaryDimension);
}
commit 77d6f58dddcc9aba0c9262c9ebb62f56e2845838
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 14 23:30:20 2012 +0000
convert text import options to .ui
Change-Id: Ice6228f0548507b0400c25f40d8aa7cb557c8088
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 978f2fa..50fbd82 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/dbgui/pvfundlg.src \
sc/source/ui/dbgui/dapitype.src \
sc/source/ui/dbgui/imoptdlg.src \
- sc/source/ui/dbgui/textimportoptions.src \
sc/source/ui/dbgui/scendlg.src \
sc/source/ui/dbgui/outline.src \
sc/source/ui/dbgui/validate.src \
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index d5696e1..628752b 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,modules/scalc))
$(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/printeroptions \
+ sc/uiconfig/scalc/ui/textimportoptions \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index efec7ab..80b9114 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1084,7 +1084,7 @@
#define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148)
#define RID_SCDLG_RETYPEPASS (SC_DIALOGS_START + 150)
#define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 151)
-#define RID_SCDLG_TEXT_IMPORT_OPTIONS (SC_DIALOGS_START + 152)
+
#define RID_POPUP_FILTER (SC_DIALOGS_START + 153)
#define RID_SCDLG_TAB_BG_COLOR (SC_DIALOGS_START + 154)
#define RID_SCDLG_DATABAR (SC_DIALOGS_START + 155)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index d09027c..a2ce65c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -336,7 +336,7 @@ public:
SvStream* pInStream, int nId,
ScImportAsciiCall eCall) = 0;
- virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ) = 0;
+ virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0;
virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
ScAutoFormat* pAutoFormat,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index a23d0ed..f0fe0d6 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -668,23 +668,12 @@ AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg
}
// ScImportAsciiDlg end
-AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg( Window* pParent, int nId )
+AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(Window* pParent)
{
- ScTextImportOptionsDlg* pDlg = NULL;
- switch (nId)
- {
- case RID_SCDLG_TEXT_IMPORT_OPTIONS:
- pDlg = new ScTextImportOptionsDlg(pParent);
- break;
- default:
- ;
- }
-
- return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL;
+ ScTextImportOptionsDlg* pDlg = new ScTextImportOptionsDlg(pParent);
+ return new AbstractScTextImportOptionsDlg_Impl(pDlg);
}
-
-
AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent,
ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index dfbd7fd..2e16c96 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -401,7 +401,7 @@ public:
SvStream* pInStream, int nId,
ScImportAsciiCall eCall);
- virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId );
+ virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent);
virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
ScAutoFormat* pAutoFormat,
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 122151d..503a5e4 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -32,27 +32,18 @@
//------------------------------------------------------------------------
#include "textimportoptions.hxx"
-#include "textimportoptions.hrc"
-
-#include "scresid.hxx"
-#include "vcl/window.hxx"
-#include "vcl/msgbox.hxx"
#include "vcl/svapp.hxx"
+#include "vcl/msgbox.hxx"
+#include "vcl/window.hxx"
-ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) :
- ModalDialog(pParent, ScResId(RID_SCDLG_TEXT_IMPORT_OPTIONS)),
-
- maBtnOk(this, ScResId(BTN_OK)),
- maBtnCancel(this, ScResId(BTN_CANCEL)),
- maBtnHelp(this, ScResId(BTN_HELP)),
- maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)),
- maRbAutomatic(this, ScResId(RB_AUTOMATIC)),
- maRbCustom(this, ScResId(RB_CUSTOM)),
- maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)),
- maFlOption(this, ScResId(FL_OPTION)),
- maBtnConvertDate(this, ScResId(BTN_CONVERT_DATE))
+ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent)
+ : ModalDialog(pParent, "TextImportOptionsDialog", "modules/scalc/ui/textimportoptions.ui")
{
- FreeResource();
+ get(m_pBtnOk, "ok");
+ get(m_pRbAutomatic, "automatic");
+ get(m_pRbCustom, "custom");
+ get(m_pBtnConvertDate, "convertdata");
+ get(m_pLbCustomLang, "lang");
init();
}
@@ -67,33 +58,33 @@ short ScTextImportOptionsDlg::Execute()
LanguageType ScTextImportOptionsDlg::getLanguageType() const
{
- if (maRbAutomatic.IsChecked())
+ if (m_pRbAutomatic->IsChecked())
return LANGUAGE_SYSTEM;
- return maLbCustomLang.GetSelectLanguage();
+ return m_pLbCustomLang->GetSelectLanguage();
}
bool ScTextImportOptionsDlg::isDateConversionSet() const
{
- return maBtnConvertDate.IsChecked();
+ return m_pBtnConvertDate->IsChecked();
}
void ScTextImportOptionsDlg::init()
{
Link aLink = LINK( this, ScTextImportOptionsDlg, OKHdl );
- maBtnOk.SetClickHdl(aLink);
+ m_pBtnOk->SetClickHdl(aLink);
aLink = LINK( this, ScTextImportOptionsDlg, RadioHdl );
- maRbAutomatic.SetClickHdl(aLink);
- maRbCustom.SetClickHdl(aLink);
+ m_pRbAutomatic->SetClickHdl(aLink);
+ m_pRbCustom->SetClickHdl(aLink);
- maRbAutomatic.Check(true);
+ m_pRbAutomatic->Check(true);
- maLbCustomLang.SetLanguageList(
+ m_pLbCustomLang->SetLanguageList(
LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false);
LanguageType eLang = Application::GetSettings().GetLanguage();
- maLbCustomLang.SelectLanguage(eLang);
- maLbCustomLang.Disable();
+ m_pLbCustomLang->SelectLanguage(eLang);
+ m_pLbCustomLang->Disable();
}
IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl)
@@ -104,13 +95,13 @@ IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl)
IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn )
{
- if (pBtn == &maRbAutomatic)
+ if (pBtn == m_pRbAutomatic)
{
- maLbCustomLang.Disable();
+ m_pLbCustomLang->Disable();
}
- else if (pBtn == &maRbCustom)
+ else if (pBtn == m_pRbCustom)
{
- maLbCustomLang.Enable();
+ m_pLbCustomLang->Enable();
}
return 0;
}
diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src
deleted file mode 100644
index f09e31c..0000000
--- a/sc/source/ui/dbgui/textimportoptions.src
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "textimportoptions.hrc"
-
-ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
-{
- HelpID = "sc:ModalDialog:RID_SCDLG_TEXT_IMPORT_OPTIONS";
- Text [ en-US ] = "Import Options" ;
- Size = MAP_APPFONT ( 230 , 101 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- OutputSize = TRUE ;
-
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 175, 6 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- DefButton = TRUE ;
- };
-
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 175, 23 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- };
-
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 175, 43 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- };
-
- FixedLine FL_CHOOSE_LANG
- {
- Pos = MAP_APPFONT( 6, 3 ) ;
- Size = MAP_APPFONT( 165, 14 ) ;
-
- Text [ en-US ] = "Select the language to use for import" ;
- };
-
- RadioButton RB_AUTOMATIC
- {
- HelpID = "sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC";
- Pos = MAP_APPFONT( 12, 20 ) ;
- Size = MAP_APPFONT( 159, 10 ) ;
- TabStop = TRUE ;
-
- Text [ en-US ] = "Automatic" ;
- };
-
- RadioButton RB_CUSTOM
- {
- HelpID = "sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM";
- Pos = MAP_APPFONT( 12, 34 ) ;
- Size = MAP_APPFONT( 159, 10 ) ;
- TabStop = TRUE ;
-
- Text [ en-US ] = "Custom" ;
- };
-
- ListBox LB_CUSTOM_LANG
- {
- HelpID = "sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG";
- Pos = MAP_APPFONT( 20, 50 ) ;
- Size = MAP_APPFONT( 140, 120 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
-
- FixedLine FL_OPTION
- {
- Pos = MAP_APPFONT( 6, 70 );
- Size = MAP_APPFONT( 165, 14 );
- Text [ en-US ] = "Options" ;
- };
-
- CheckBox BTN_CONVERT_DATE
- {
- HelpID = "sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE";
- Pos = MAP_APPFONT( 12, 86 );
- Size = MAP_APPFONT( 159, 10 );
- TabStop = TRUE ;
- Text [ en-US ] = "Detect special numbers (such as dates)." ;
- };
-};
diff --git a/sc/source/ui/inc/textimportoptions.hrc b/sc/source/ui/inc/textimportoptions.hrc
deleted file mode 100644
index ea346cd..0000000
--- a/sc/source/ui/inc/textimportoptions.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sc.hrc>
-
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-
-#define FL_CHOOSE_LANG 4
-#define RB_AUTOMATIC 5
-#define RB_CUSTOM 6
-#define LB_CUSTOM_LANG 7
-#define FL_OPTION 8
-#define BTN_CONVERT_DATE 9
diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
index 27be357..31cdeec 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -50,20 +50,14 @@ private:
void init();
private:
- OKButton maBtnOk;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
+ OKButton* m_pBtnOk;
- FixedLine maFlChooseLang;
+ RadioButton* m_pRbAutomatic;
+ RadioButton* m_pRbCustom;
- RadioButton maRbAutomatic;
- RadioButton maRbCustom;
+ SvxLanguageBox* m_pLbCustomLang;
- SvxLanguageBox maLbCustomLang;
-
- FixedLine maFlOption;
-
- CheckBox maBtnConvertDate;
+ CheckBox* m_pBtnConvertDate;
DECL_LINK(OKHdl, void *);
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 1d35a9c..bd4afdd 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -236,8 +236,8 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
else
{
// HTML import.
- ::std::auto_ptr<AbstractScTextImportOptionsDlg> pDlg(
- pFact->CreateScTextImportOptionsDlg(NULL, RID_SCDLG_TEXT_IMPORT_OPTIONS));
+ boost::scoped_ptr<AbstractScTextImportOptionsDlg> pDlg(
+ pFact->CreateScTextImportOptionsDlg(NULL));
if (pDlg->Execute() == RET_OK)
{
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index be970f4..820b7b9 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -309,8 +309,8 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
// this for html pasting only, but in the future it may
// make sense to do it for other data types too.
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- ::std::auto_ptr<AbstractScTextImportOptionsDlg> pDlg(
- pFact->CreateScTextImportOptionsDlg(NULL, RID_SCDLG_TEXT_IMPORT_OPTIONS));
+ boost::scoped_ptr<AbstractScTextImportOptionsDlg> pDlg(
+ pFact->CreateScTextImportOptionsDlg(NULL));
if (pDlg->Execute() == RET_OK)
{
diff --git a/sc/uiconfig/scalc/ui/textimportoptions.ui b/sc/uiconfig/scalc/ui/textimportoptions.ui
new file mode 100644
index 0000000..47b1be5
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/textimportoptions.ui
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="TextImportOptionsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Import Options</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="custom">
+ <property name="label" translatable="yes">Custom</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">automatic</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="GtkRadioButton" id="automatic">
+ <property name="label" translatable="yes">Automatic</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">custom</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxcorelo:SvxLanguageBox" id="lang">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Select the language to use for import</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkCheckButton" id="convertdata">
+ <property name="label" translatable="yes">Detect special numbers (such as dates).</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 3b238706737c36d4772ec3f95b52fbde978bf20a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 14 21:14:23 2012 +0000
callcatcher: remove another layer of binfilter-released methods
Change-Id: Id5bedd660b2ada460ffc48ce28d4f8ab9cd89226
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index 711dce2..98a09ce 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -351,7 +351,6 @@ public:
virtual sal_Bool ValidateMode( StreamMode ) const;
virtual const SvStream* GetSvStream() const;
virtual sal_Bool Equals( const BaseStorage& rStream ) const;
- sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index c0a0021..ff081f2 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3253,31 +3253,4 @@ String UCBStorage::CreateLinkFile( const String& rName )
return String();
}
-sal_Bool UCBStorage::SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue )
-{
- if ( rName.CompareToAscii("Title") == COMPARE_EQUAL )
- return sal_False;
-
- if ( rName.CompareToAscii("MediaType") == COMPARE_EQUAL )
- {
- ::rtl::OUString aTmp;
- rValue >>= aTmp;
- pImp->m_aContentType = aTmp;
- }
-
- try
- {
- if ( pImp->GetContent() )
- {
- pImp->m_pContent->setPropertyValue( rName, rValue );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
-
- return sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/treelistentry.hxx b/svtools/inc/svtools/treelistentry.hxx
index b3df912..50734ab 100644
--- a/svtools/inc/svtools/treelistentry.hxx
+++ b/svtools/inc/svtools/treelistentry.hxx
@@ -81,9 +81,6 @@ public:
bool HasChildListPos() const;
sal_uLong GetChildListPos() const;
- SvTreeListEntries& GetChildEntries();
- const SvTreeListEntries& GetChildEntries() const;
-
void Clone(SvTreeListEntry* pSource);
size_t ItemCount() const;
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index c34b53c..f375b59 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -106,16 +106,6 @@ sal_uLong SvTreeListEntry::GetChildListPos() const
return ( nListPos & 0x7fffffff );
}
-SvTreeListEntries& SvTreeListEntry::GetChildEntries()
-{
- return maChildren;
-}
-
-const SvTreeListEntries& SvTreeListEntry::GetChildEntries() const
-{
- return maChildren;
-}
-
void SvTreeListEntry::Clone(SvTreeListEntry* pSource)
{
nListPos &= 0x80000000;
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 296a08e..53f097f 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -414,9 +414,6 @@ public:
pBegin,
const sal_Unicode * pEnd);
- static const sal_Char * skipComment(const sal_Char * pBegin,
- const sal_Char * pEnd);
-
static const sal_Unicode * skipComment(const sal_Unicode * pBegin,
const sal_Unicode * pEnd);
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 834583e..2aa1a7e 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -513,37 +513,6 @@ const sal_Unicode * INetMIME::skipLinearWhiteSpace(const sal_Unicode * pBegin,
}
// static
-const sal_Char * INetMIME::skipComment(const sal_Char * pBegin,
- const sal_Char * pEnd)
-{
- DBG_ASSERT(pBegin && pBegin <= pEnd,
- "INetMIME::skipComment(): Bad sequence");
-
- if (pBegin != pEnd && *pBegin == '(')
- {
- sal_uInt32 nLevel = 0;
- for (const sal_Char * p = pBegin; p != pEnd;)
- switch (*p++)
- {
- case '(':
- ++nLevel;
- break;
-
- case ')':
- if (--nLevel == 0)
- return p;
- break;
-
- case '\\':
- if (p != pEnd)
- ++p;
- break;
- }
- }
- return pBegin;
-}
-
-// static
const sal_Unicode * INetMIME::skipComment(const sal_Unicode * pBegin,
const sal_Unicode * pEnd)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 826a596..52a55b5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -12,8 +12,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any cons
String::String(unsigned short)
SvListView::GetModel() const
SvTreeList::GetChildIterators(SvTreeListEntry const*) const
-SvTreeListEntry::GetChildEntries()
-SvTreeListEntry::GetChildEntries() const
SvtGraphicStroke::toString() const
TextEngine::GetLeftMargin() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
@@ -45,12 +43,9 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
connectivity::file::OStatement_Base::reset()
-connectivity::mork::MQueryHelper::next()
-connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, rtl::OUString&)
connectivity::mork::OColumnAlias::OColumnAlias()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
-dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
More information about the Libreoffice-commits
mailing list