[Libreoffice-commits] .: 2 commits - binfilter/bf_svtools binfilter/bf_svx binfilter/inc

[Stephan Bergmann]

 binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |    6 +-----
 binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx              |    6 +++---
 binfilter/bf_svx/source/svdraw/svx_svdotext.cxx              |   10 +++++-----
 binfilter/inc/bf_svx/svdomeas.hxx                            |    6 +++---
 binfilter/inc/bf_svx/svdotext.hxx                            |    4 ++--
 5 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit a7ba481a04be4c05ea17d6fbdf200a61e04550ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 21 21:26:09 2011 +0200

    Some more warning cleanup.

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index 674c47e..e55e6ef 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -796,11 +796,11 @@ namespace binfilter {
 /*N*/   if (pOutlinerParaObject==NULL) SetTextDirty(); // Text neu berechnen!
 /*N*/ }
 
-/*N*/ void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
-/*N*/   Rectangle* pAnchorRect, BOOL bLineWidth ) const
+/*N*/ void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect,
+/*N*/   Rectangle* pAnchorRect ) const
 /*N*/ {
 /*N*/   if (bTextDirty) UndirtyText();
-/*N*/   SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
+/*N*/   SdrTextObj::TakeTextRect( rOutliner, rTextRect, pAnchorRect );
 /*N*/ }
 
 /*N*/ void SdrMeasureObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
index baca551..ad5268e 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
@@ -424,8 +424,8 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 /*N*/   rAnchorRect=aAnkRect;
 /*N*/ }
 
-/*N*/ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
-/*N*/                              Rectangle* pAnchorRect, BOOL /*bLineWidth*/ ) const
+/*N*/ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect,
+/*N*/                              Rectangle* pAnchorRect ) const
 /*N*/ {
 /*N*/   Rectangle aAnkRect; // Rect innerhalb dem geankert wird
 /*N*/   TakeTextAnchorRect(aAnkRect);
@@ -615,7 +615,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 /*N*/               SdrOutliner& rOutliner=ImpGetDrawOutliner();
 /*N*/               Rectangle aTextRect;
 /*N*/               Rectangle aAnchorRect;
-/*N*/               TakeTextRect(rOutliner,aTextRect,TRUE,&aAnchorRect); // EditText ignorieren!
+/*N*/               TakeTextRect(rOutliner,aTextRect,&aAnchorRect); // EditText ignorieren!
 /*N*/               SdrFitToSizeType eFit=GetFitToSize();
 /*N*/               bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
 /*N*/               if (bFitToSize) aTextRect=aAnchorRect;
@@ -652,7 +652,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 /*N*/   }
 /*N*/   else
 /*N*/   {
-/*N*/       TakeTextRect( *pOutliner, aTextRect, FALSE, &aLclAnchor, FALSE ); // EditText nicht mehr ignorieren! TRUE); // EditText ignorieren!
+/*N*/       TakeTextRect( *pOutliner, aTextRect, &aLclAnchor ); // EditText nicht mehr ignorieren! TRUE); // EditText ignorieren!
 /*N*/
 /*N*/       if (bFitToSize)
 /*?*/           aR=aLclAnchor;
@@ -761,7 +761,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 /*N*/   if (pOutlinerParaObject!=NULL && !IsFontwork() && !IsContourTextFrame()) {
 /*?*/       Rectangle aLclAnchor;
 /*?*/       Rectangle aR;
-/*?*/       TakeTextRect(rOutliner,aR,FALSE,&aLclAnchor);
+/*?*/       TakeTextRect(rOutliner,aR,&aLclAnchor);
 /*?*/       rOutliner.Clear();
 /*?*/       SdrFitToSizeType eFit=GetFitToSize();
 /*?*/       bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
diff --git a/binfilter/inc/bf_svx/svdomeas.hxx b/binfilter/inc/bf_svx/svdomeas.hxx
index f40d10e..73798d9 100644
--- a/binfilter/inc/bf_svx/svdomeas.hxx
+++ b/binfilter/inc/bf_svx/svdomeas.hxx
@@ -87,11 +87,11 @@ public:
     virtual void NbcSetPoint(const Point& rPnt, USHORT i);
 
 
-    virtual bool BegTextEdit(SdrOutliner& rOutl) { return false; } // DBG_BF_ASSERT
+    virtual bool BegTextEdit(SdrOutliner&) { return false; } // DBG_BF_ASSERT
     virtual void EndTextEdit(SdrOutliner& rOutl);
     virtual const Size& GetTextSize() const;
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText=FALSE,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect,
+        Rectangle* pAnchorRect ) const;
     virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
     virtual OutlinerParaObject* GetOutlinerParaObject() const;
diff --git a/binfilter/inc/bf_svx/svdotext.hxx b/binfilter/inc/bf_svx/svdotext.hxx
index e74cb1a..c007de8 100644
--- a/binfilter/inc/bf_svx/svdotext.hxx
+++ b/binfilter/inc/bf_svx/svdotext.hxx
@@ -223,8 +223,8 @@ public:
 
     // Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
     // der des EditOutliners) und die PaperSize gesetzt.
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText=FALSE,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect,
+        Rectangle* pAnchorRect ) const;
     virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
     inline long GetEckenradius() const;
     bool IsAutoGrowHeight() const;
commit eabff82441147285032c342b03ac54feb6b2e87f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 21 17:20:06 2011 +0200

    Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.

diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index 144b01d..4248127 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -1026,11 +1026,7 @@ void GraphicFilter::ImplInit()
 
     if( bUseConfig )
     {
-#if defined WNT
-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR"));
-#else
-        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("OOO_BASE_DIR"));
-#endif
+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
         rtl::Bootstrap::expandMacros(url); //TODO: detect failure
         utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath);
     }