[Libreoffice-commits] .: 4 commits - extras/source qadevOOo/testdocs sfx2/source svl/inc svl/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Mar 14 05:09:10 PDT 2012
extras/source/database/biblio.README | 16 +++++++---------
extras/source/database/biblio.odb |binary
qadevOOo/testdocs/ttt.sdw |binary
sfx2/source/dialog/filedlghelper.cxx | 15 +--------------
svl/inc/svl/rngitem.hxx | 11 -----------
svl/source/items/rngitem.cxx | 6 ------
svl/source/items/rngitem_inc.cxx | 14 ++------------
unusedcode.easy | 9 ---------
8 files changed, 10 insertions(+), 61 deletions(-)
New commits:
commit 848127a6c3975bbbe09d8fe9ca704bf47030168d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 14 11:26:40 2012 +0000
make sdw smoketest document more useful
diff --git a/qadevOOo/testdocs/ttt.sdw b/qadevOOo/testdocs/ttt.sdw
index 235a852..fa7a336 100644
Binary files a/qadevOOo/testdocs/ttt.sdw and b/qadevOOo/testdocs/ttt.sdw differ
commit 9de6b045ab27f5f103194a9109eacf53ea29a8b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 14 11:13:58 2012 +0000
toggle on view all records in biblio.odb
diff --git a/extras/source/database/biblio.README b/extras/source/database/biblio.README
index 8a25c5d..7c1fcb0 100644
--- a/extras/source/database/biblio.README
+++ b/extras/source/database/biblio.README
@@ -3,19 +3,17 @@ the database inside the .odb, instead it is configured to store its data in the
per-user database/biblio/biblio.dbf and database/biblio/biblio.dbt files. i.e.
the contents of the ~/.libreoffice/3/user/database/biblio dir.
-If you edit biblio.odb in "base" you will really just be changing your local data
-store.
+If you edit biblio.odb in "base" you will really just be changing your local
+data store.
-So, to really change the bibliography the easiest thing to do is to launch writer and
-use tools->bibliography database and edit your local one through that UI [1]
+So, to really change the bibliography the easiest thing to do is to launch
+writer and use tools->bibliography database and edit your local one through
+that UI.
Then *copy* ~/.libreoffice/3/user/database/biblio/biblio.db* to
extras/source/database/ in order to overwrite biblio.dbf and biblio.dbt and
copy ~/.libreoffice/3/user/database/biblio.odb to
extras/source/database/biblio.odb
-[1] a) oddly base doesn't show the same fields that the bibliography widget does,
- possibly a bug worth fixing ?
- b) oddly base doesn't seem to "PACK" the dbase III files after editing, so
- deleted records still take up space in the file, possibly a bug worth
- fixing ?
+NOTE: base doesn't seem to "PACK" the dbase III files after editing, so deleted
+records still take up space in the file, possibly a bug worth fixing ?
diff --git a/extras/source/database/biblio.odb b/extras/source/database/biblio.odb
index 4e19692..199fd6f 100644
Binary files a/extras/source/database/biblio.odb and b/extras/source/database/biblio.odb differ
commit 60cf5b57b0cf12cad3406289e261d637c20f20d9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 14 11:07:45 2012 +0000
callcatcher: update list
diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index 02eeb06..3f65263 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.hxx
@@ -38,16 +38,6 @@
#undef SfxXRangeItem
#undef SfxXRangesItem
-#ifndef _SFXITEMS_HXX
-#define NUMTYPE sal_uLong
-#define SfxXRangeItem SfxULongRangeItem
-#define SfxXRangesItem SfxULongRangesItem
-#include <svl/rngitem.hxx>
-#undef NUMTYPE
-#undef SfxXRangeItem
-#undef SfxXRangesItem
-#endif
-
#define _SFXRNGITEM_HXX
#else
@@ -94,7 +84,6 @@ private:
public:
TYPEINFO();
SfxXRangesItem();
- SfxXRangesItem( sal_uInt16 nWID, const NUMTYPE *pRanges );
SfxXRangesItem( sal_uInt16 nWID, SvStream &rStream );
SfxXRangesItem( const SfxXRangesItem& rItem );
virtual ~SfxXRangesItem();
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index de742d7..924a5c2 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -36,12 +36,6 @@
#include <svl/rngitem.hxx>
#include "rngitem_inc.cxx"
-#define NUMTYPE sal_uInt32
-#define SfxXRangeItem SfxULongRangeItem
-#define SfxXRangesItem SfxULongRangesItem
-#include <svl/rngitem.hxx>
-#include "rngitem_inc.cxx"
-
#else
// We leave this condition just in case NUMTYPE has been defined externally to this
diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index 7c87cb7..2ce9857 100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
@@ -108,7 +108,7 @@ SfxPoolItem* SfxXRangeItem::Clone(SfxItemPool *) const
SfxPoolItem* SfxXRangeItem::Create(SvStream &rStream, sal_uInt16) const
{
- NUMTYPE nVon, nBis;
+ NUMTYPE nVon(0), nBis(0);
rStream >> nVon;
rStream >> nBis;
return new SfxXRangeItem( Which(), nVon, nBis );
@@ -132,20 +132,10 @@ SfxXRangesItem::SfxXRangesItem()
//-------------------------------------------------------------------------
-SfxXRangesItem::SfxXRangesItem( sal_uInt16 nWID, const NUMTYPE *pRanges )
-: SfxPoolItem( nWID )
-{
- NUMTYPE nCount = Count_Impl(pRanges) + 1;
- _pRanges = new NUMTYPE[nCount];
- memcpy( _pRanges, pRanges, sizeof(NUMTYPE) * nCount );
-}
-
-//-------------------------------------------------------------------------
-
SfxXRangesItem::SfxXRangesItem( sal_uInt16 nWID, SvStream &rStream )
: SfxPoolItem( nWID )
{
- NUMTYPE nCount;
+ NUMTYPE nCount(0);
rStream >> nCount;
_pRanges = new NUMTYPE[nCount + 1];
for ( NUMTYPE n = 0; n < nCount; ++n )
diff --git a/unusedcode.easy b/unusedcode.easy
index 77ae5b4..dbe22fb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -136,19 +136,10 @@ SfxUINT32s::Remove(unsigned short, unsigned short)
SfxUINT32s::Replace(unsigned int const&, unsigned short)
SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
Slider::Slider(Window*, ResId const&)
SmFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SortedPositions::Insert(SortedPositions const*, unsigned short, unsigned short)
-SortedPositions::Insert(unsigned int const&, unsigned short&)
-SortedPositions::Insert(unsigned int const*, unsigned short)
-SortedPositions::Remove(unsigned int const&, unsigned short)
-SortedPositions::Remove(unsigned short, unsigned short)
-SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
-SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
-SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
SpanStyleManager::get(WPXString const&) const
SpinButton::SpinButton(Window*, ResId const&)
commit 66c62ca16d1faa1bdb21757dc1abb8752df53293
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 13 17:22:30 2012 +0000
we just want to know if its a directory/folder or not
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 8da6138..3bf4fb5 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2473,23 +2473,10 @@ ErrCode FileDialogHelper::GetGraphic( Graphic& rGraphic ) const
// ------------------------------------------------------------------------
static int impl_isFolder( const OUString& rPath )
{
- uno::Reference< task::XInteractionHandler > xHandler;
- try
- {
- uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
- xHandler.set( xFactory->createInstance( DEFINE_CONST_OUSTRING( "com.sun.star.task.InteractionHandler" ) ),
- uno::UNO_QUERY_THROW );
- }
- catch ( const Exception & )
- {
- }
-
- ::rtl::Reference< ::comphelper::StillReadWriteInteraction > aHandler = new ::comphelper::StillReadWriteInteraction( xHandler );
-
try
{
::ucbhelper::Content aContent(
- rPath, new ::ucbhelper::CommandEnvironment( static_cast< task::XInteractionHandler* > ( aHandler.get() ), uno::Reference< ucb::XProgressHandler >() ) );
+ rPath, uno::Reference< ucb::XCommandEnvironment > () );
if ( aContent.isFolder() )
return 1;
More information about the Libreoffice-commits
mailing list