[Libreoffice-commits] .: 3 commits - basic/inc basic/source
basic/inc/basic/basicrt.hxx |8
basic/source/sbx/sbxcurr.cxx |9 +
basic/source/sbx/sbxvalue.cxx |7 +++
3 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 8529da08517b41bd9317714e3216bb6d487b24ee
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 10:12:47 2011 +0300
WaE: unreachable code
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 8b55561..7ca1d9c 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1311,9 +1311,16 @@ Lbl_OpIsDouble:
else aL.nDouble /= aR.nDouble; break;
case SbxPLUS:
aL.nDouble += aR.nDouble; break;
+#if 0
+// See 'break' on preceding line... this
+// is unreachable code. Do not delete this
+// #if 0 block unless you know for sure
+// the 'break' above is intentional.
+
// #45465 Date needs with + a special handling:
forces date type
if( GetType() == SbxDATE || rOp.GetType() ==
SbxDATE )
aL.eType = SbxDATE;
+#endif
case SbxMINUS:
aL.nDouble -= aR.nDouble; break;
case SbxNEG:
commit ba491984f49ca29bcfe0515145bcef0c12189270
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 10:08:06 2011 +0300
WaE: inconsistent dll linkage
basicrt goes into the static app library, so DLL import/export
decorations meaningless.
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 981fe18..4e6b4de 100644
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -40,9 +40,9 @@ class BasicRuntime
SbiRuntime* pRun;
public:
BasicRuntime( SbiRuntime* p ) : pRun ( p ){;}
-BASIC_DLLPUBLIC const String GetSourceRevision();
-BASIC_DLLPUBLIC const String GetModuleName( SbxNameType nType );
-BASIC_DLLPUBLIC const String GetMethodName( SbxNameType nType );
+const String GetSourceRevision();
+const String GetModuleName( SbxNameType nType );
+const String GetMethodName( SbxNameType nType );
xub_StrLen GetLine();
xub_StrLen GetCol1();
xub_StrLen GetCol2();
@@ -64,7 +64,7 @@ public:
xub_StrLen GetCol2();
};
-class BASIC_DLLPUBLIC BasicRuntimeAccess
+class BasicRuntimeAccess
{
public:
static BasicRuntime GetRuntime();
commit cce8278ebaf333024b867d9b68d3feb70235f1dc
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 09:36:07 2011 +0300
WaE: unreachable code
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 574c804..c227681 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -268,13 +268,21 @@ start:
case SbxSALINT64:
{
nRes = p-nInt64 * CURRENCY_FACTOR; break;
+#if 0
+// Huh, is the 'break' above intentional? That means this
+// is unreachable, obviously. Avoid warning by ifdeffing
+// this out for now. Do not delete this #if 0 block unless
+// you know for sure the 'break' above is intentional.
if ( nRes SbxMAXSALINT64 )
{
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXSALINT64;
}
+#endif
}
case SbxSALUINT64:
nRes = p-nInt64 * CURRENCY_FACTOR; break;
+#if 0
+// As above
if ( nRes SbxMAXSALINT64 )
{
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXSALINT64;
@@ -284,6 +292,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINSALINT64;
}
break;
+#endif
//TODO: bring back SbxINT64 types here for limits -1 with flag value at
SAL_MAX/MIN
case SbxSINGLE:
if( p-nSingle * CURRENCY_FACTOR + 0.5 (float)SAL_MAX_INT64
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - accessibility/source canvas/source
accessibility/source/extended/AccessibleToolPanelDeck.cxx |2 +-
canvas/source/cairo/cairo_canvashelper.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5cb1597064e81e0ea90d6a000854f9305a45c87a
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 12:00:07 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index be22454..79088d5 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -98,7 +98,7 @@ namespace accessibility
boolisDisposed() const { return m_pPanelDeck == NULL; }
voiddispose();
-~AccessibleToolPanelDeck_Impl();
+virtual ~AccessibleToolPanelDeck_Impl();
Reference XAccessible getOwnAccessible() const;
Reference XAccessible getActivePanelAccessible();
commit 6db1788c08b82b0a459d4c480133fa8341ef256f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 11:44:44 2011 +0300
WaE: '=' : truncation of constant value
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 0d94db3..7150c46 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1870,7 +1870,7 @@ namespace cairocanvas
*pColors++ = vcl::unotools::toByteColor(pIn-Blue);
*pColors++ = vcl::unotools::toByteColor(pIn-Green);
*pColors++ = vcl::unotools::toByteColor(pIn-Red);
-*pColors++ = 255;
+*pColors++ = -1;
++pIn;
}
return aRes;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - accessibility/source avmedia/source
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx |2 +-
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx |2 +-
avmedia/source/win/window.cxx |1 +
3 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 56d6da052e71f6ff374248d8a7dbe92c4ddf7d74
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 12:51:51 2011 +0300
STRSAFE_NO_DEPRECATE
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index c1b543d..9cc32b9 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -33,6 +33,7 @@
#include objbase.h
#include strmif.h
#include control.h
+#define STRSAFE_NO_DEPRECATE
#include dshow.h
#if defined _MSC_VER
#pragma warning(pop)
commit bdda05135e4e13e417ef480a8ca6171bdbb8a16e
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Oct 6 12:18:41 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index f4864c9..ec469a2 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -117,7 +117,7 @@ namespace accessibility
::svt::IToolPanelDeck i_rPanelDeck,
::svt::PanelTabBar i_rTabBar
);
-~AccessibleToolPanelTabBar_Impl();
+virtual ~AccessibleToolPanelTabBar_Impl();
voidcheckDisposed();
boolisDisposed() const { return m_pPanelDeck == NULL; }
diff --git
a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index b621124..e228017 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -91,7 +91,7 @@ namespace accessibility
::svt::PanelTabBar i_rTabBar,
const size_t i_nItemPos
);
-~AccessibleToolPanelDeckTabBarItem_Impl();
+virtual ~AccessibleToolPanelDeckTabBarItem_Impl();
::svt::PanelTabBar* getTabBar() const { return m_pTabBar; }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcmis/makefile.mk
libcmis/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 46da2ed6be6df4089df338098f69375e3e494e44 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Oct 6 15:26:18 2011 +0200 System libcmis fix diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk index 50a8324..df93424 100644 --- a/libcmis/makefile.mk +++ b/libcmis/makefile.mk @@ -36,7 +36,7 @@ TARGET=cmis # --- Files -.IF $(SYSTEM_LIBcmis) == YES +.IF $(SYSTEM_LIBCMIS) == YES @all: @echo Using system libcmis... .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: distro-configs/LibreOfficeAndroid.conf
distro-configs/LibreOfficeAndroid.conf |1 - 1 file changed, 1 deletion(-) New commits: commit d8541ddba4ff38d4c8c8e33b192b8c28e734c987 Author: Thorsten Behrens tbehr...@novell.com Date: Thu Oct 6 16:03:54 2011 +0200 cmis disable got removed from configure diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 45befb1..6075646 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -18,5 +18,4 @@ --without-java --without-junit --without-ppds ---without-cmis --without-stlport ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcmis/prj
libcmis/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 696f4b98d05aee3fb245ccb97fdb1c50080bf0af Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Oct 6 16:10:11 2011 +0200 Fix dependencies of libcmis diff --git a/libcmis/prj/build.lst b/libcmis/prj/build.lst index c2beeeb..68de49e 100644 --- a/libcmis/prj/build.lst +++ b/libcmis/prj/build.lst @@ -1,3 +1,3 @@ -lc libcmis : BOOST:boost soltools NULL +lc libcmis : BOOST:boost CURL:curl LIBXML2:libxml2 soltools NULL lc libcmis usr1- all lc_mkout NULL lc libcmis nmake - all lc_libcmis NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unusedcode.easy
unusedcode.easy | 17 + 1 file changed, 17 insertions(+) New commits: commit ea4e833c37892b7cf8154244662f8437facaad98 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 6 15:21:45 2011 +0100 update unused list, note AtomPubSession dtor unused, i.e. probable leak diff --git a/unusedcode.easy b/unusedcode.easy index 7680434..535cbf8 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,6 +1,10 @@ (anonymous namespace)::Registration::~Registration() (anonymous namespace)::getState(std::vectorcppcanvas::internal::OutDevState, std::allocatorcppcanvas::internal::OutDevState const) (anonymous namespace)::writeInfo(com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey const, rtl::OUString const, rtl::OUString const) +AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar, std::char_traitschar, std::allocatorchar ) +AtomFolder::AtomFolder(AtomPubSession*, std::basic_stringchar, std::char_traitschar, std::allocatorchar ) +AtomPubSession::getCollectionUrl(Collection::Type) +AtomPubSession::~AtomPubSession() BitmapPalette::IsGreyPalette() const BufferNode::childAt(int) const ByteString::Assign(char const*, unsigned short) @@ -488,6 +492,7 @@ ScDocument::IsLoadingMedium() const ScDocument::ValidNewTabName(std::vectorString, std::allocatorString const) const ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const, unsigned long) ScFilterDetect::impl_createFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const) +ScFiltersTest::testVba() ScFormulaCell::ScFormulaCell() ScGridWindow::InvertSimple(short, int, short, int, unsigned char, unsigned char) ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short) @@ -1981,6 +1986,17 @@ binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const, unsigned short) binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const, unsigned short) binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short) binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const, void*), void*) +boost::date_time::nth_as_str(int) +boost::gregorian::create_facet_def(char) +boost::gregorian::create_facet_def(wchar_t) +boost::gregorian::generate_locale(std::locale, char) +boost::gregorian::generate_locale(std::locale, wchar_t) +boost::gregorian::greg_month::get_month_map_ptr() +boost::gregorian::greg_weekday::as_long_string() const +boost::gregorian::greg_weekday::as_long_wstring() const +boost::gregorian::greg_weekday::as_short_string() const +boost::gregorian::greg_weekday::as_short_wstring() const +boost::gregorian::special_value_from_string(std::basic_stringchar, std::char_traitschar, std::allocatorchar const) cairocanvas::CanvasHelper::flush() const cairocanvas::CanvasHelper::getPalette() cairocanvas::SpriteDeviceHelper::getSurface() @@ -2405,6 +2421,7 @@ layoutimpl::VCLXTabControl::AddChild(com::sun::star::uno::Referencecom::sun::st layoutimpl::WidgetFactory::sfx2CreateWindow(VCLXWindow**, Window*, rtl::OUString const, long) layoutimpl::getParent(com::sun::star::uno::Referencecom::sun::star::uno::XInterface) layoutimpl::prophlp::getProperty(com::sun::star::uno::Referencecom::sun::star::uno::XInterface const, rtl::OUString const) +libcmis::SessionFactory::getRepositories(std::mapint, std::basic_stringchar, std::char_traitschar, std::allocatorchar , std::lessint, std::allocatorstd::pairint const, std::basic_stringchar, std::char_traitschar, std::allocatorchar) libvisio::VSDXCharacterList::getElement(unsigned int) libvisio::VSDXOutputElementList::addEllipse(WPXPropertyList const) libvisio::VSDXOutputElementList::addEndLayer() ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dociter.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0e600dd2805f9284b01a1030f0ad1b720acdaeae
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 6 12:01:31 2011 -0400
VALGRIND=memcheck = sc unit test discovered bug.
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 76a254f..bc9689b 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -517,7 +517,8 @@ SCSIZE
ScDBQueryDataIterator::SearchColEntryIndex(ScDocument rDoc, SCTAB nTab,
ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const
ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument*
pDoc) :
DataAccess(pParent),
mpParam(pParam),
-mpDoc(pDoc)
+mpDoc(pDoc),
+bCalcAsShown( pDoc-GetDocOptions().IsCalcAsShown() )
{
nCol = mpParam-mnField;
nRow = mpParam-nRow1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - default_images/sw sw/source
default_images/sw/res/page_break.png |binary
sw/source/ui/docvw/PageBreakWin.cxx | 82 ---
2 files changed, 48 insertions(+), 34 deletions(-)
New commits:
commit 6d508f856fa04952a2a8cc0528c04c0d7e9cf3cf
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Oct 6 22:26:11 2011 +0200
Page Break: implemented final paint of the indicator and its line length
diff --git a/default_images/sw/res/page_break.png
b/default_images/sw/res/page_break.png
index c9b7c16..41541cc 100644
Binary files a/default_images/sw/res/page_break.png and
b/default_images/sw/res/page_break.png differ
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 08425db..5ccb209 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -37,6 +37,7 @@
#include IDocumentUndoRedo.hxx
#include PageBreakWin.hxx
#include pagefrm.hxx
+#include PostItMgr.hxx
#include view.hxx
#include viewopt.hxx
#include wrtsh.hxx
@@ -53,8 +54,9 @@
#include vcl/decoview.hxx
#include vcl/svapp.hxx
-#define BUTTON_SIZE 30
-#define ARROW_WIDTH 20
+#define BUTTON_WIDTH 30
+#define BUTTON_HEIGHT 19
+#define ARROW_WIDTH 9
using namespace basegfx;
using namespace basegfx::tools;
@@ -65,7 +67,7 @@ namespace
B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds )
{
B2DPolygon aRetval;
-const double nRadius = 4;
+const double nRadius = 1;
const double nKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
// Create the top left corner
@@ -204,39 +206,34 @@ void SwPageBreakWin::Paint( const Rectangle )
sdr::contact::createBaseProcessor2DFromOutputDevice(
*this, aNewViewInfos );
-pProcessor-process( aSeq );
-
-// Paint the picture
-Image aImg( SW_RES( IMG_PAGE_BREAK ) );
-DrawImage( Point( 3, 3 ), aImg );
-
// Paint the symbol if not readonly button
if ( IsEnabled() )
{
-Point aPicPos( aRect.getWidth() - ARROW_WIDTH, 0 );
-Size aPicSize( ARROW_WIDTH, aRect.getHeight() );
-Rectangle aSymbolRect( aPicPos, aPicSize );
-
-// 10% distance to the left
-const long nBorderDistanceLeft =
((aSymbolRect.GetWidth()*100)+500)/1000;
-aSymbolRect.Left()+=nBorderDistanceLeft;
-// 40% distance to the right
-const long nBorderDistanceRight =
((aSymbolRect.GetWidth()*400)+500)/1000;
-aSymbolRect.Right()-=nBorderDistanceRight;
-// 30% distance to the top button border
-const long nBorderDistanceTop =
((aSymbolRect.GetHeight()*300)+500)/1000;
-aSymbolRect.Top()+=nBorderDistanceTop;
-// 25% distance to the bottom button border
-const long nBorderDistanceBottom =
((aSymbolRect.GetHeight()*250)+500)/1000;
-aSymbolRect.Bottom()-=nBorderDistanceBottom;
-
-SymbolType nSymbol = SYMBOL_SPIN_DOWN;
-DecorationView aDecoView( this );
-aDecoView.DrawSymbol( aSymbolRect, nSymbol,
- (
Application::GetSettings().GetStyleSettings().GetHighContrastMode()
-? Color( COL_WHITE )
-: Color( COL_BLACK ) ) );
+double nTop = double( aRect.getHeight() ) / 2.0;
+double nBottom = nTop + 4.0;
+double nLeft = aRect.getWidth( ) - ARROW_WIDTH - 6.0;
+double nRight = aRect.getWidth( ) - ARROW_WIDTH + 2.0;
+
+B2DPolygon aTriangle;
+aTriangle.append( B2DPoint( nLeft, nTop ) );
+aTriangle.append( B2DPoint( nRight, nTop ) );
+aTriangle.append( B2DPoint( ( nLeft + nRight ) / 2.0, nBottom ) );
+aTriangle.setClosed( true );
+
+BColor aTriangleColor = Color( COL_BLACK ).getBColor( );
+if (
Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
+aTriangleColor = Color( COL_WHITE ).getBColor( );
+
+aSeq.realloc( aSeq.getLength() + 1 );
+aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new
PolyPolygonColorPrimitive2D(
+ B2DPolyPolygon( aTriangle ), aTriangleColor ) );
}
+
+pProcessor-process( aSeq );
+
+// Paint the picture
+Image aImg( SW_RES( IMG_PAGE_BREAK ) );
+DrawImage( Point( 3, 1 ), aImg );
}
void SwPageBreakWin::Select( )
@@ -312,7 +309,7 @@ void SwPageBreakWin::UpdatePosition( )
if ( aFrmRect.Top() == aPrevFrmRect.Top() )
nYLineOffset = ( aBoundRect.Top() + aFrmRect.Top() ) / 2;
-Size aBtnSize( BUTTON_SIZE + ARROW_WIDTH, BUTTON_SIZE );
+Size aBtnSize( BUTTON_WIDTH + ARROW_WIDTH, BUTTON_HEIGHT );
Point aBtnPos( aFrmRect.Left() - aBtnSize.Width() + ARROW_WIDTH / 2,
nYLineOffset - aBtnSize.Height() / 2 );
@@ -320,7 +317,11 @@ void SwPageBreakWin::UpdatePosition( )
// Update the line position
Point aLinePos( aFrmRect.Left() + ARROW_WIDTH / 2, nYLineOffset );
-Size aLineSize( aBoundRect.getWidth(), 1 );
+unsigned long
[Libreoffice-commits] .: Branch 'feature/writeable-oletool' - src/ole.py src/oletool.py
src/ole.py | 30 -- src/oletool.py | 29 - 2 files changed, 40 insertions(+), 19 deletions(-) New commits: commit 77e73a40bbaf5273ba775e70026c4494bdfbe30f Author: Noel Power noel.po...@novell.com Date: Thu Oct 6 21:58:13 2011 +0100 fixed lots of brainfarts and added lots of debug diff --git a/src/ole.py b/src/ole.py index c67df09..ae22314 100644 --- a/src/ole.py +++ b/src/ole.py @@ -92,6 +92,7 @@ class Header(object): self.secSizeShort = 64 self.params = params +self.__SSAT = None def getSectorSize (self): return 2**self.secSize @@ -277,8 +278,11 @@ class Header(object): self.bytes[68:72] = struct.pack( 'l', self.secIDFirstMSAT ) self.bytes[72:76] = struct.pack( 'l', self.numSecMSAT ) # write the MSAT, SAT SSAT +print *** writing MSAT self.writeMSAT() +print *** writing SAT self.getSAT().write() +print *** writing SSAT self.getSSAT().write() def writeMSAT (self): @@ -319,17 +323,19 @@ class Header(object): def getSSAT (self): +if self.__SSAT != None: +return self.__SSAT ssatID = self.getFirstSectorID(BlockType.SSAT) if ssatID 0: return None chain = self.getSAT().getSectorIDChain(ssatID) if len(chain) == 0: return None -obj = SSAT(2**self.secSize, self.bytes, self.params) +self.__SSAT = SSAT(2**self.secSize, self.bytes, self.params) for secID in chain: -obj.addSector(secID) -obj.buildArray() -return obj +self.__SSAT.addSector(secID) +self.__SSAT.buildArray() +return self.__SSAT def expandSSAT( self, numExtraEntriesNeeded ): # create enough sectors to increase SAT table to accomadate new entries @@ -344,6 +350,8 @@ class Header(object): # add the sectors into the SSAT for sectorID in newSATSectors: self.getSSAT().sectorIDs.append( sectorID ) +#mark the sectors as used by the SAT table +self.getSAT().array[ sectorID ] = -2 # expand SSAT array with the contens of the new SATSectors self.getSSAT().appendArray( newSATSectors ) # need to update the SectorIDChain for the SSAT @@ -372,14 +380,17 @@ class Header(object): print Error: haven't implemented expanding the SAT to allow more sectors to be allocated for the MSAT return chain self.createSATSectors( MSATSectors ) - +self.getSAT().appendArray( MSATSectors ) #is there room in the MSAT table header part if len( self.getMSAT().secIDs ) + len( MSATSectors ) 109: for sector in MSATSectors: self.getMSAT().appendSectorID( sector ) -self.getSAT().appendArray( MSATSectors ) +self.getSAT().addSector( sector ) +#mark MSAT sectors in SAT array as in use by MSAT +self.getSAT().array[ sector ] = -4 else: print *** extending the MSAT not supported yes + #try again chain = self.getSAT().getFreeChainEntries( numNeeded, 0 ) @@ -524,16 +535,20 @@ class SAT(object): self.appendArray( self.sectorIDs ) def appendArray( self, sectorIDs ): +print reading sectors, sectorIDs numItems = self.sectorSize / 4 for secID in sectorIDs: pos = 512 + secID*self.sectorSize for i in xrange(0, numItems): beginPos = pos + i*4 id = getSignedInt(self.bytes[beginPos:beginPos+4]) +print index %d, len(self.sectorIDs) %d sectorID %d pos %d value %d%(len(self.array) , len(self.sectorIDs),secID, beginPos, id ) self.array.append(id) + def write (self): #writes the contents of the SAT array to memory sectors +print sectors making up the SAT or SAT are ,self.sectorIDs for index in xrange(0, len( self.array )): entryPos = 4 * index #calculate the offset into a sector @@ -716,6 +731,8 @@ entire file stream. elif entry.StreamLocation == StreamLocation.SSAT: chain = self.header.getSSAT().getSectorIDChain(entry.StreamSectorID) +print __getRawStream extracting from chain , chain + if entry.StreamLocation == StreamLocation.SSAT: # Get the root storage stream. if self.RootStorage == None: @@ -743,6 +760,7 @@ entire file stream. secSize = self.header.getSectorSize() numSectors = len(targetChain) print writing out %d sectors%(numSectors) +print chain is , targetChain for i in xrange(0, numSectors ): srcPos = ( i * secSize )
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/xmlexprt.cxx | 13 -
sc/source/filter/xml/xmlimprt.cxx | 14 --
2 files changed, 27 deletions(-)
New commits:
commit 6b280c938d2213cf9e7ddea13baa38427c3b5c6d
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Oct 7 00:51:06 2011 +0900
delete NULL is safe
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 51ac341..52e35dc 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -540,31 +540,18 @@ ScXMLExport::ScXMLExport(
ScXMLExport::~ScXMLExport()
{
-if (pGroupColumns)
delete pGroupColumns;
-if (pGroupRows)
delete pGroupRows;
-if (pColumnStyles)
delete pColumnStyles;
-if (pRowStyles)
delete pRowStyles;
-if (pCellStyles)
delete pCellStyles;
-if (pRowFormatRanges)
delete pRowFormatRanges;
-if (pMergedRangesContainer)
delete pMergedRangesContainer;
-if (pValidationsContainer)
delete pValidationsContainer;
-if (pChangeTrackingExportHelper)
delete pChangeTrackingExportHelper;
-if (pChartListener)
delete pChartListener;
-if (pCellsItr)
delete pCellsItr;
-if (pDefaults)
delete pDefaults;
-if (pNumberFormatAttributesExportHelper)
delete pNumberFormatAttributesExportHelper;
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 3c61a1d..f14b43e 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1674,9 +1674,6 @@ ScXMLImport::ScXMLImport(
sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)),
sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)),
sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)),
-// pScAutoStylePool(new SvXMLAutoStylePoolP),
-// pParaItemMapper( 0 ),
-// pI18NMap( new SvI18NMap ),
pDocElemTokenMap( 0 ),
pStylesElemTokenMap( 0 ),
pStylesAttrTokenMap( 0 ),
@@ -1869,27 +1866,16 @@ ScXMLImport::~ScXMLImport() throw()
delete pDataPilotMemberAttrTokenMap;
delete pConsolidationAttrTokenMap;
-// if (pScAutoStylePool)
-// delete pScAutoStylePool;
-if (pChangeTrackingImportHelper)
delete pChangeTrackingImportHelper;
-if (pNumberFormatAttributesExportHelper)
delete pNumberFormatAttributesExportHelper;
-if (pStyleNumberFormats)
delete pStyleNumberFormats;
-if (pStylesImportHelper)
delete pStylesImportHelper;
-if (pSolarMutexGuard)
delete pSolarMutexGuard;
-if (pMyNamedExpressions)
delete pMyNamedExpressions;
-if (pMyLabelRanges)
delete pMyLabelRanges;
-if (pValidations)
delete pValidations;
-if (pDetectiveOpArray)
delete pDetectiveOpArray;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/ExternalLib.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8cc9bf475a351bd0851f057f38ee596ca9ecc7ce Author: David Tardon dtar...@redhat.com Date: Fri Oct 7 07:05:15 2011 +0200 --strip-component is GNU tar extension diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index daec9dc..90763f4 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -101,7 +101,7 @@ endef define gb_ExternalLib__command_autotools rm -fr $(call gb_ExternalLib_get_workdir,$(1)) \ mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) \ - tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $ \ + $(GNUTAR) -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $ \ cd $(call gb_ExternalLib_get_builddir,$(1)) for p in $(T_PATCHES) ; do patch -p 1 $(gb_REPOS)/$$p || exit 1; done \ CC=$(gb_CC) CXX=$(gb_CXX) CFLAGS=$(T_CFLAGS) CXXFLAGS=$(T_CXXFLAGS) PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig ./configure $(if $(findstring YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) --prefix=$(OUTDIR) $(T_CONF_ARGS) \ for p in $(T_POST_PATCHES) ; do patch -p 1 $(gb_REPOS)/$p || exit 1; done ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
