diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
commit | fdc4da32a09265b19470ab09db998ea28936106e (patch) | |
tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 /dbaccess/source/ui/inc/CollectionView.hxx | |
parent | aa20084bd041208841d5ad3ca50b1e963eb5986e (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:14 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Sat Jan 15 05:39:40 2011 +0100
i#116187: report left/right page margin setting ignored on Unix 64 bit
(cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
reportdesign/source/ui/report/ReportController.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit ae3903b548d8d05807cc7f3a029495388de5e302
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Fri Jan 14 11:24:43 2011 -0500
Remove the Registration... menu item which we don't want. (fdo#33112)
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd
Author: Noel Power <noel.power@novell.com>
Date: Wed Jan 12 11:09:51 2011 +0000
fix for fdo#32742#
reportdesign/source/ui/inspection/metadata.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 66d25b635de422a4a811710cb3289266d9a11a84
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:35 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: base_libreoffice-3.3.0.4
Diffstat (limited to 'dbaccess/source/ui/inc/CollectionView.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/CollectionView.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 395ad71f3e0c..deb5750b9566 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,24 +43,24 @@ namespace dbaui /* this class allows to browse through the collection of forms and reports */ class OCollectionView : public ModalDialog - { - FixedText m_aFTCurrentPath; - ImageButton m_aNewFolder; - ImageButton m_aUp; - SvtFileView m_aView; - FixedText m_aFTName; - Edit m_aName; - FixedLine m_aFL; - PushButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_sPath; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - Size m_aDlgSize; - Size m_a6Size; - sal_Int32 m_nFixDeltaHeight; - sal_Bool m_bCreateForm; + { + FixedText m_aFTCurrentPath; + ImageButton m_aNewFolder; + ImageButton m_aUp; + SvtFileView m_aView; + FixedText m_aFTName; + Edit m_aName; + FixedLine m_aFL; + PushButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_sPath; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + Size m_aDlgSize; + Size m_a6Size; + sal_Int32 m_nFixDeltaHeight; + sal_Bool m_bCreateForm; DECL_LINK(Up_Click,PushButton*); DECL_LINK(NewFolder_Click,PushButton*); @@ -80,7 +80,7 @@ namespace dbaui ::rtl::OUString getName() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... |