From 36070535cb6c1a257d2ea2cb3f10e83bf3aaa96f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 16 Jan 2015 15:29:45 +0200 Subject: vcl: VclPtr conversion in forms Change-Id: I141cbe218fec31f2e6428b1d8c56c00557134a36 --- .../source/deployment/gui/dp_gui_dependencydialog.cxx | 2 -- .../source/deployment/gui/dp_gui_dependencydialog.hxx | 2 -- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 19 +++++++++++++++++++ desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 ++ desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 ++++++ desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 1 + desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 9 ++++++--- desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3 +-- .../deployment/gui/dp_gui_updateinstalldialog.cxx | 10 +++++++++- .../deployment/gui/dp_gui_updateinstalldialog.hxx | 1 + desktop/source/deployment/gui/license_dialog.cxx | 7 +++++++ 11 files changed, 52 insertions(+), 10 deletions(-) (limited to 'desktop') diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index da831ad9b38f..ca6eb1b4ce03 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -50,6 +50,4 @@ DependencyDialog::DependencyDialog( } } -DependencyDialog::~DependencyDialog() {} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 1175470c33d5..eec14539869a 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -38,8 +38,6 @@ public: DependencyDialog( vcl::Window * parent, std::vector< OUString > const & dependencies); - virtual ~DependencyDialog(); - private: DependencyDialog(DependencyDialog &) SAL_DELETED_FUNCTION; void operator =(DependencyDialog &) SAL_DELETED_FUNCTION; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index bd2392093047..75b7803ced88 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -137,6 +137,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl public: ExtBoxWithBtns_Impl(vcl::Window* pParent); virtual ~ExtBoxWithBtns_Impl(); + virtual void dispose() SAL_OVERRIDE; void InitFromDialog(ExtMgrDialog *pParentDialog); @@ -201,10 +202,16 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Wi ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl() +{ + dispose(); +} + +void ExtBoxWithBtns_Impl::dispose() { delete m_pOptionsBtn; delete m_pEnableBtn; delete m_pRemoveBtn; + ExtensionBox_Impl::dispose(); } @@ -715,8 +722,14 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager) ExtMgrDialog::~ExtMgrDialog() +{ + dispose(); +} + +void ExtMgrDialog::dispose() { m_aIdle.Stop(); + ModelessDialog::dispose(); } @@ -1196,8 +1209,14 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan } UpdateRequiredDialog::~UpdateRequiredDialog() +{ + dispose(); +} + +void UpdateRequiredDialog::dispose() { m_aIdle.Stop(); + ModalDialog::dispose(); } long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage, diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 0db6be025f18..c5e7c38b16f8 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -141,6 +141,7 @@ class ExtMgrDialog : public ModelessDialog, public: ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager ); virtual ~ExtMgrDialog(); + virtual void dispose() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; @@ -212,6 +213,7 @@ class UpdateRequiredDialog : public ModalDialog, public: UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager ); virtual ~UpdateRequiredDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 260100f3ca03..8eaf3f71e1a6 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -238,6 +238,11 @@ void ExtensionBox_Impl::Init() ExtensionBox_Impl::~ExtensionBox_Impl() +{ + dispose(); +} + +void ExtensionBox_Impl::dispose() { if ( ! m_bInDelete ) DeleteRemoved(); @@ -264,6 +269,7 @@ ExtensionBox_Impl::~ExtensionBox_Impl() delete m_pLocale; delete m_pCollator; + ::svt::IExtensionListBox::dispose(); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 1590f82500a5..c2635edd9f51 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -182,6 +182,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox public: ExtensionBox_Impl(vcl::Window* pParent); virtual ~ExtensionBox_Impl(); + virtual void dispose() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 5a66653d400e..0aa7c2f0da20 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -563,6 +563,11 @@ UpdateDialog::UpdateDialog( UpdateDialog::~UpdateDialog() +{ + dispose(); +} + +void UpdateDialog::dispose() { storeIgnoredUpdates(); @@ -575,6 +580,7 @@ UpdateDialog::~UpdateDialog() delete (*i); } delete m_pUpdates; + ModalDialog::dispose(); } @@ -599,9 +605,6 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d SetNormalStaticImage(Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))); } -UpdateDialog::CheckListBox::~CheckListBox() {} - - sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const { sal_uLong i = GetEntryCount(); OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max()); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index c2eedcbba4b2..8420aacc9bf5 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -85,6 +85,7 @@ public: std::vector< dp_gui::UpdateData > * updateData); virtual ~UpdateDialog(); + virtual void dispose() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; @@ -111,8 +112,6 @@ private: CheckListBox( vcl::Window* pParent, UpdateDialog & dialog); - virtual ~CheckListBox(); - sal_uInt16 getItemCount() const; private: diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 0dd3e5a97c5e..b67c026c7284 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -237,7 +237,15 @@ UpdateInstallDialog::UpdateInstallDialog( m_pHelp->Disable(); } -UpdateInstallDialog::~UpdateInstallDialog() {} +UpdateInstallDialog::~UpdateInstallDialog() +{ + dispose(); +} + +void UpdateInstallDialog::dispose() +{ + ModalDialog::dispose(); +} bool UpdateInstallDialog::Close() { diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index bff71e788820..d9a343790193 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -60,6 +60,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xCtx); virtual ~UpdateInstallDialog(); + virtual void dispose() SAL_OVERRIDE; bool Close() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index c9aab531d127..916525a6b7fb 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -57,6 +57,7 @@ class LicenseView : public MultiLineEdit, public SfxListener public: LicenseView( vcl::Window* pParent, WinBits nStyle ); virtual ~LicenseView(); + virtual void dispose() SAL_OVERRIDE; void ScrollDown( ScrollType eScroll ); @@ -121,10 +122,16 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Windo } LicenseView::~LicenseView() +{ + dispose(); +} + +void LicenseView::dispose() { maEndReachedHdl = Link(); maScrolledHdl = Link(); EndListeningAll(); + MultiLineEdit::dispose(); } void LicenseView::ScrollDown( ScrollType eScroll ) -- cgit ctor-7.5.9-release'>distro/vector/vector-7.5.9-release LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/extras/source/autotext/lang/ca/standard/FN/Object_1
AgeCommit message (Collapse)Author
2021-09-06remove unnecessary settings.xml from autotextJustin Luth
I don't think that anyone wants their document settings adjusted just by entering some autotext. [Now, it didn't seem to be doing that because I suppose that since the value already exists, the import won't overwrite it.] find extras/source -name settings.xml | md5sum | sort //shows only a few unique entries. Visual comparing with "Meld" //didn't reveal any reason why the files are useful. I also removed ./autotext/lang/bg/standard/FN/Obj0012D655/settings.xml based on Laurent's advice, even though it contains <config:config-item config:name="Formula" E=mc^2 Otherwise, the other 7 versions were almost identical, differening only in OOo version .9, or 1.1 and show redline changes on/off. cd exttras/source find . -name settings.xml -exec rm {} \; git grep -l \/settings.xml *.xml | xargs sed -i /\/settings.xml/d git grep -l \/settings.xml ../CustomTarget_autotextshare.mk \ | xargs sed -i "/\/settings.xml/d" Change-Id: I9c148bdff55e6757e6fa98401486bc7c41ebf25d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121605 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2014-07-02Build all l10n AutoTextLaurent Balland-Poirier
- Remove .bau files - Unzip .bau - Add missing mimetype files - Remove trailing spaces and tabs - Change directory names of standard/FN/Object 1 to standard/FN/Object_1 - Add files to project (3800 files) - Remove non-UTF8 characters in sk/template/HLB and sk/template/HRB - Move user autotext in CustomTarget to a sub directory "user" to avoid conflict with shared autotext - Change all META-INF/manifest.xml to add DOCTYPE line and complete manifest tag - Add AllLangCustomTarget_autotextshare.mk - Make relative path for office.dtd and Manifest.dtd in xml file - Correct pl/standard/ZO/atevent.xml and pl/template/PT1/atevent.xml Caolan's dream: https://bugs.freedesktop.org/show_bug.cgi?id=40499#c36 Change-Id: I17486cd88f380976990291a7d12969cc7751fb84 Reviewed-on: https://gerrit.libreoffice.org/9954 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>