[Libreoffice-commits] .: 9 commits - boost/boost_1_44_0-logical-op-parentheses.patch boost/boost_1_44_0-unused-parameters.patch boost/makefile.mk cppcanvas/source framework/source sc/qa sc/source vcl/inc vcl/ios
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Apr 3 15:06:49 PDT 2012
boost/boost_1_44_0-logical-op-parentheses.patch | 12 +
boost/boost_1_44_0-unused-parameters.patch | 77 ++++++++
boost/makefile.mk | 1
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 2
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx | 2
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 6
cppcanvas/source/mtfrenderer/rendergraphicaction.cxx | 2
framework/source/classes/menumanager.cxx | 8
sc/qa/unit/helper/debughelper.hxx | 3
sc/source/core/data/dpgroup.cxx | 9
sc/source/filter/oox/worksheetfragment.cxx | 20 --
vcl/inc/ios/salframeview.h | 5
vcl/ios/source/gdi/salcoretextfontutils.cxx | 177 -------------------
vcl/ios/source/gdi/salcoretextlayout.cxx | 26 ++
vcl/ios/source/gdi/salnativewidgets.cxx | 18 +
vcl/ios/source/window/salframeview.mm | 16 +
16 files changed, 168 insertions(+), 216 deletions(-)
New commits:
commit 86b99ab408c7235604a1a02d7bc531fe5d5f97f6
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Apr 4 00:57:00 2012 +0300
Clang WaE: -Woverloaded-virtual weirdness, this seems to help
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 2129ca5..39f240a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -60,6 +60,8 @@ namespace cppcanvas
class BitmapAction : public CachedPrimitiveBase
{
public:
+ using CachedPrimitiveBase::render;
+
BitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr&,
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 8cef77f..4e72cae 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -79,11 +79,11 @@ namespace cppcanvas
protected:
using Action::render;
- private:
virtual bool render( ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix& rTransformation ) const = 0;
+ private:
CanvasSharedPtr mpCanvas;
mutable ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCachedPrimitive > mxCachedPrimitive;
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index dcfe33c..2ff5316 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -61,6 +61,8 @@ namespace cppcanvas
class PolyPolyAction : public CachedPrimitiveBase
{
public:
+ using CachedPrimitiveBase::render;
+
PolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
@@ -245,6 +247,8 @@ namespace cppcanvas
class TexturedPolyPolyAction : public CachedPrimitiveBase
{
public:
+ using CachedPrimitiveBase::render;
+
TexturedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState,
@@ -359,6 +363,8 @@ namespace cppcanvas
class StrokedPolyPolyAction : public CachedPrimitiveBase
{
public:
+ using CachedPrimitiveBase::render;
+
StrokedPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState,
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
index f5ce0ee..237f781 100644
--- a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
@@ -60,6 +60,8 @@ namespace cppcanvas
class RenderGraphicAction : public CachedPrimitiveBase
{
public:
+ using CachedPrimitiveBase::render;
+
RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
commit 558d34fef7327317a42eb76320fd28cd361a3f9a
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Apr 4 00:02:02 2012 +0300
Typo
diff --git a/boost/boost_1_44_0-unused-parameters.patch b/boost/boost_1_44_0-unused-parameters.patch
index 8f77a78..79ad4b8 100644
--- a/boost/boost_1_44_0-unused-parameters.patch
+++ b/boost/boost_1_44_0-unused-parameters.patch
@@ -488,8 +488,8 @@
{
typedef scanner_policies<
inhibit_case_iteration_policy<
---- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/grammar.hpp
-+++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/grammar.hpp
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
@@ -83,7 +83,7 @@
{ // Does _not_ copy the helpers member !
}
commit 2b00b0e0a1a47c3d174ee9e86826b60a356f3dbf
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 23:45:26 2012 +0300
WaE: call to pure virtual member function
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 4b0af60..202b7eb 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -146,8 +146,14 @@ MenuManager::MenuManager(
m_xFrame = rFrame;
m_bInitialized = sal_False;
m_bIsBookmarkMenu = sal_False;
+#ifdef LIBO_WERROR
+ // Wtf? Clang says: call to pure virtual member function
+ // 'acquire'; overrides of 'acquire' in subclasses are not
+ // available in the constructor of 'XInterface'
+ assert(!"Call to pure virtual member function");
+#else
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
-
+#endif
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
commit 3b4941eddaa3bf0e23952613b091d8f54d898d29
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 23:28:31 2012 +0300
WaE: unused function
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 8091112..0b0c25f 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -735,26 +735,6 @@ void WorksheetFragment::importEmbeddedOleData( StreamDataSequence& orEmbeddedDat
getBaseFilter().importBinaryData( orEmbeddedData, aFragmentPath );
}
-namespace {
-
-OUString lclReadDataValMessage( BiffInputStream& rStrm )
-{
- // empty strings are single NUL characters (string length is 1)
- OUString aMessage = rStrm.readUniString( true );
- if( (aMessage.getLength() == 1) && (aMessage[ 0 ] == 0) )
- aMessage = OUString();
- return aMessage;
-}
-
-ApiTokenSequence lclReadDataValFormula( BiffInputStream& rStrm, FormulaParser& rParser )
-{
- sal_uInt16 nFmlaSize = rStrm.readuInt16();
- rStrm.skip( 2 );
- return rParser.importFormula( CellAddress(), FORMULATYPE_VALIDATION, rStrm, &nFmlaSize );
-}
-
-} // namespace
-
} // namespace xls
} // namespace oox
commit 65d8b8a39c296684a02722e2910aa744b205d74a
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 23:28:14 2012 +0300
WaE: unused function
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index a129fec..a0bb5d9 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -68,15 +68,6 @@ using ::boost::shared_ptr;
const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calculations
-namespace {
-
-inline bool IsInteger( double fValue )
-{
- return rtl::math::approxEqual( fValue, rtl::math::approxFloor(fValue) );
-}
-
-}
-
class ScDPGroupNumFilter : public ScDPCacheTable::FilterBase
{
public:
commit 504f30621c4fc4a1447c0b25caf19027ac04b310
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 23:27:39 2012 +0300
WaE: unused function
diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx
index cb2bad7..6a01f52 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -59,6 +59,9 @@ using ::std::vector;
namespace {
+#ifdef __GNUC__
+__attribute__((used))
+#endif
::std::ostream& operator<< (::std::ostream& os, const rtl::OUString& str)
{
return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
commit b91061f8e90a5da5db424f010d00cdf5cc60922b
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 23:08:46 2012 +0300
WaE: '&&' within '||'
diff --git a/boost/boost_1_44_0-logical-op-parentheses.patch b/boost/boost_1_44_0-logical-op-parentheses.patch
new file mode 100644
index 0000000..33a8ea0
--- /dev/null
+++ b/boost/boost_1_44_0-logical-op-parentheses.patch
@@ -0,0 +1,12 @@
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/composite/directives.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/composite/directives.hpp
+@@ -364,7 +364,7 @@
+
+ if (l || r)
+ {
+- if (l.length() < r.length() && l || !r)
++ if ((l.length() < r.length() && l) || !r)
+ {
+ scan.first = save;
+ return l;
+
diff --git a/boost/makefile.mk b/boost/makefile.mk
index cab945f..27e588d 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -69,6 +69,7 @@ PATCH_FILES+=boost.windows.patch
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
.IF "$(COM)" == "GCC"
PATCH_FILES += boost_1_44_0-unused-parameters.patch
+PATCH_FILES += boost_1_44_0-logical-op-parentheses.patch
.END
# Backporting fixes for the GCC 4.7 -std=c++11 mode from Boost 1.48.0:
commit 3afbf314b76ab2677accf330915088c07bd7c471
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 22:24:33 2012 +0300
WaE fixes to the mostly dummy iOS code
diff --git a/vcl/inc/ios/salframeview.h b/vcl/inc/ios/salframeview.h
index 6925989..2501e2b 100644
--- a/vcl/inc/ios/salframeview.h
+++ b/vcl/inc/ios/salframeview.h
@@ -37,12 +37,10 @@
-(id)initWithSalFrame: (IosSalFrame*)pFrame;
-(BOOL)canBecomeKeyWindow;
-(void)displayIfNeeded;
--(void)becomeKeyWindow;
--(void)resignKeyWindow;
-(IosSalFrame*)getSalFrame;
@end
- at interface SalFrameView : UIView <UITextInput>
+ at interface SalFrameView : UIView
{
IosSalFrame* mpFrame;
@@ -64,7 +62,6 @@
-(BOOL)acceptsFirstResponder;
-(BOOL)isOpaque;
-(void)drawRect: (CGRect)aRect;
--(void)flagsChanged: (UIEvent*)pEvent;
@end
#endif
diff --git a/vcl/ios/source/gdi/salcoretextfontutils.cxx b/vcl/ios/source/gdi/salcoretextfontutils.cxx
index b67e954..388d497 100644
--- a/vcl/ios/source/gdi/salcoretextfontutils.cxx
+++ b/vcl/ios/source/gdi/salcoretextfontutils.cxx
@@ -36,180 +36,6 @@
#include "ios/saldata.hxx"
#include "ios/salcoretextfontutils.hxx"
-// we have to get the font attributes from the name table
-// since neither head's macStyle nor OS/2's panose are easily available
-// during font enumeration. macStyle bits would be not sufficient anyway
-// and SFNT fonts on Mac usually do not contain an OS/2 table.
-static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& rDFA )
-{
- rtl::OString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
-
- // TODO: use a multi-string ignore-case matcher once it becomes available
- if( (aPSName.indexOf("regular") != -1)
- || (aPSName.indexOf("normal") != -1)
- || (aPSName.indexOf("roman") != -1)
- || (aPSName.indexOf("medium") != -1)
- || (aPSName.indexOf("plain") != -1)
- || (aPSName.indexOf("standard") != -1)
- || (aPSName.indexOf("std") != -1) )
- {
- rDFA.meWidthType = WIDTH_NORMAL;
- rDFA.meWeight = WEIGHT_NORMAL;
- rDFA.meItalic = ITALIC_NONE;
- }
-
- // heuristics for font weight
- if (aPSName.indexOf("extrablack") != -1)
- rDFA.meWeight = WEIGHT_BLACK;
- else if (aPSName.indexOf("black") != -1)
- rDFA.meWeight = WEIGHT_BLACK;
- //else if (aPSName.indexOf("book") != -1)
- // rDFA.meWeight = WEIGHT_SEMIBOLD;
- else if( (aPSName.indexOf("semibold") != -1)
- || (aPSName.indexOf("smbd") != -1))
- rDFA.meWeight = WEIGHT_SEMIBOLD;
- else if (aPSName.indexOf("ultrabold") != -1)
- rDFA.meWeight = WEIGHT_ULTRABOLD;
- else if (aPSName.indexOf("extrabold") != -1)
- rDFA.meWeight = WEIGHT_BLACK;
- else if( (aPSName.indexOf("bold") != -1)
- || (aPSName.indexOf("-bd") != -1))
- rDFA.meWeight = WEIGHT_BOLD;
- else if (aPSName.indexOf("extralight") != -1)
- rDFA.meWeight = WEIGHT_ULTRALIGHT;
- else if (aPSName.indexOf("ultralight") != -1)
- rDFA.meWeight = WEIGHT_ULTRALIGHT;
- else if (aPSName.indexOf("light") != -1)
- rDFA.meWeight = WEIGHT_LIGHT;
- else if (aPSName.indexOf("thin") != -1)
- rDFA.meWeight = WEIGHT_THIN;
- else if (aPSName.indexOf("-w3") != -1)
- rDFA.meWeight = WEIGHT_LIGHT;
- else if (aPSName.indexOf("-w4") != -1)
- rDFA.meWeight = WEIGHT_SEMILIGHT;
- else if (aPSName.indexOf("-w5") != -1)
- rDFA.meWeight = WEIGHT_NORMAL;
- else if (aPSName.indexOf("-w6") != -1)
- rDFA.meWeight = WEIGHT_SEMIBOLD;
- else if (aPSName.indexOf("-w7") != -1)
- rDFA.meWeight = WEIGHT_BOLD;
- else if (aPSName.indexOf("-w8") != -1)
- rDFA.meWeight = WEIGHT_ULTRABOLD;
- else if (aPSName.indexOf("-w9") != -1)
- rDFA.meWeight = WEIGHT_BLACK;
-
- // heuristics for font slant
- if( (aPSName.indexOf("italic") != -1)
- || (aPSName.indexOf(" ital") != -1)
- || (aPSName.indexOf("cursive") != -1)
- || (aPSName.indexOf("-it") != -1)
- || (aPSName.indexOf("lightit") != -1)
- || (aPSName.indexOf("mediumit") != -1)
- || (aPSName.indexOf("boldit") != -1)
- || (aPSName.indexOf("cnit") != -1)
- || (aPSName.indexOf("bdcn") != -1)
- || (aPSName.indexOf("bdit") != -1)
- || (aPSName.indexOf("condit") != -1)
- || (aPSName.indexOf("bookit") != -1)
- || (aPSName.indexOf("blackit") != -1) )
- rDFA.meItalic = ITALIC_NORMAL;
- if( (aPSName.indexOf("oblique") != -1)
- || (aPSName.indexOf("inclined") != -1)
- || (aPSName.indexOf("slanted") != -1) )
- rDFA.meItalic = ITALIC_OBLIQUE;
-
- // heuristics for font width
- if( (aPSName.indexOf("condensed") != -1)
- || (aPSName.indexOf("-cond") != -1)
- || (aPSName.indexOf("boldcond") != -1)
- || (aPSName.indexOf("boldcn") != -1)
- || (aPSName.indexOf("cnit") != -1) )
- rDFA.meWidthType = WIDTH_CONDENSED;
- else if (aPSName.indexOf("narrow") != -1)
- rDFA.meWidthType = WIDTH_SEMI_CONDENSED;
- else if (aPSName.indexOf("expanded") != -1)
- rDFA.meWidthType = WIDTH_EXPANDED;
- else if (aPSName.indexOf("wide") != -1)
- rDFA.meWidthType = WIDTH_EXPANDED;
-
- // heuristics for font pitch
- if( (aPSName.indexOf("mono") != -1)
- || (aPSName.indexOf("courier") != -1)
- || (aPSName.indexOf("monaco") != -1)
- || (aPSName.indexOf("typewriter") != -1) )
- rDFA.mePitch = PITCH_FIXED;
-
- // heuristics for font family type
- if( (aPSName.indexOf("script") != -1)
- || (aPSName.indexOf("chancery") != -1)
- || (aPSName.indexOf("zapfino") != -1))
- rDFA.meFamily = FAMILY_SCRIPT;
- else if( (aPSName.indexOf("comic") != -1)
- || (aPSName.indexOf("outline") != -1)
- || (aPSName.indexOf("pinpoint") != -1) )
- rDFA.meFamily = FAMILY_DECORATIVE;
- else if( (aPSName.indexOf("sans") != -1)
- || (aPSName.indexOf("arial") != -1) )
- rDFA.meFamily = FAMILY_SWISS;
- else if( (aPSName.indexOf("roman") != -1)
- || (aPSName.indexOf("times") != -1) )
- rDFA.meFamily = FAMILY_ROMAN;
-
- // heuristics for codepoint semantic
- if( (aPSName.indexOf("symbol") != -1)
- || (aPSName.indexOf("dings") != -1)
- || (aPSName.indexOf("dingbats") != -1)
- || (aPSName.indexOf("ornaments") != -1)
- || (aPSName.indexOf("embellishments") != -1) )
- rDFA.mbSymbolFlag = true;
-
- // #i100020# special heuristic for names with single-char styles
- // NOTE: we are checking name that hasn't been lower-cased
- if( rPSName.Len() > 3 )
- {
- int i = rPSName.Len();
- sal_Unicode c = rPSName.GetChar( --i );
- if( c == 'C' ) { // "capitals"
- rDFA.meFamily = FAMILY_DECORATIVE;
- c = rPSName.GetChar( --i );
- }
- if( c == 'O' ) { // CFF-based OpenType
- c = rPSName.GetChar( --i );
- }
- if( c == 'I' ) { // "italic"
- rDFA.meItalic = ITALIC_NORMAL;
- c = rPSName.GetChar( --i );
- }
- if( c == 'B' ) // "bold"
- rDFA.meWeight = WEIGHT_BOLD;
- if( c == 'C' ) // "capitals"
- rDFA.meFamily = FAMILY_DECORATIVE;
- // TODO: check that all single-char styles have been resolved?
- }
-}
-
-static bool GetDevFontAttributes( CTFontRef nFontRef, ImplDevFontAttributes& rDFA )
-{
- // all CT fonts are device fonts that can be directly rotated
- rDFA.mbOrientation = true;
- rDFA.mbDevice = true;
- rDFA.mnQuality = 0;
-
- // reset the attributes
- rDFA.meFamily = FAMILY_DONTKNOW;
- rDFA.mePitch = PITCH_VARIABLE;
- rDFA.meWidthType = WIDTH_NORMAL;
- rDFA.meWeight = WEIGHT_NORMAL;
- rDFA.meItalic = ITALIC_NONE;
- rDFA.mbSymbolFlag = false;
-
- // Implement...
-
- return false;
-}
-
-// =======================================================================
-
SystemFontList::SystemFontList()
{
}
@@ -220,6 +46,9 @@ SystemFontList::~SystemFontList()
void SystemFontList::AnnounceFonts( ImplDevFontList& rFontList ) const
{
+ (void) rFontList;
+
+ // Implement...
}
// not all fonts are suitable for glyph fallback => sort them
diff --git a/vcl/ios/source/gdi/salcoretextlayout.cxx b/vcl/ios/source/gdi/salcoretextlayout.cxx
index 461bb9c..3ff4c07 100644
--- a/vcl/ios/source/gdi/salcoretextlayout.cxx
+++ b/vcl/ios/source/gdi/salcoretextlayout.cxx
@@ -130,7 +130,9 @@ CoreTextLayout::CoreTextLayout( CTFontSymbolicTraits& rCoreTextStyle, float fFon
mpDeltaY( NULL ),
mpFallbackInfo( NULL ),
mnBaseAdv( 0 )
-{}
+{
+ (void) rCoreTextStyle;
+}
// -----------------------------------------------------------------------
@@ -150,23 +152,33 @@ CoreTextLayout::~CoreTextLayout()
bool CoreTextLayout::LayoutText( ImplLayoutArgs& rArgs )
{
+ (void) rArgs;
// Implement...
return true;
}
void CoreTextLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
+ (void) rArgs;
// Implement...
}
void CoreTextLayout::DrawText( SalGraphics& rGraphics ) const
{
+ (void) rGraphics;
// Implement...
}
int CoreTextLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int& nStart,
sal_Int32* pGlyphAdvances, int* pCharIndexes ) const
{
+ (void) nLen;
+ (void) pGlyphIDs;
+ (void) rPos;
+ (void) nStart;
+ (void) pGlyphAdvances;
+ (void) pCharIndexes;
+
if( nStart < 0 ) // first glyph requested?
nStart = 0;
@@ -195,20 +207,30 @@ long CoreTextLayout::FillDXArray( long* pDXArray ) const
int CoreTextLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
{
+ (void) nMaxWidth;
+ (void) nCharExtra;
+ (void) nFactor;
+ // Implement...
return 0;
}
void CoreTextLayout::GetCaretPositions( int nMaxIndex, long* pCaretXArray ) const
{
+ (void) nMaxIndex;
+ (void) pCaretXArray;
+ // Implement...
}
bool CoreTextLayout::GetBoundRect( SalGraphics&, Rectangle& rVCLRect ) const
{
+ (void) rVCLRect;
+ // Implement;
return true;
}
bool CoreTextLayout::InitGIA( ImplLayoutArgs* pArgs ) const
{
+ (void) pArgs;
// no need to run InitGIA more than once on the same CoreTextLayout object
if( mnGlyphCount >= 0 )
return true;
@@ -280,6 +302,8 @@ const ImplFontData* CoreTextLayout::GetFallbackFontData( sal_GlyphId nGlyphId )
int FallbackInfo::AddFallback( CTFontRef nFontId )
{
+ (void) nFontId;
+ // Implement...
return 0;
}
diff --git a/vcl/ios/source/gdi/salnativewidgets.cxx b/vcl/ios/source/gdi/salnativewidgets.cxx
index 23d8b8d..c2d5068 100644
--- a/vcl/ios/source/gdi/salnativewidgets.cxx
+++ b/vcl/ios/source/gdi/salnativewidgets.cxx
@@ -186,16 +186,23 @@ sal_Bool IosSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar
sal_Bool IosSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
const Point& rPos, sal_Bool& rIsInside )
{
+ (void) nType;
+ (void) nPart;
+ (void) rControlRegion;
+ (void) rPos;
+ (void) rIsInside;
return sal_False;
}
UInt32 IosSalGraphics::getState( ControlState nState )
{
+ (void) nState;
return 0;
}
UInt32 IosSalGraphics::getTrackState( ControlState nState )
{
+ (void) nState;
return 0;
}
@@ -215,6 +222,11 @@ sal_Bool IosSalGraphics::drawNativeControl(ControlType nType,
const ImplControlValue& aValue,
const rtl::OUString& )
{
+ (void) nType;
+ (void) nPart;
+ (void) rControlRegion;
+ (void) nState;
+ (void) aValue;
return sal_False;
}
@@ -236,6 +248,12 @@ sal_Bool IosSalGraphics::getNativeControlRegion( ControlType nType, ControlPart
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
{
+ (void) nType;
+ (void) nPart;
+ (void) rControlRegion;
+ (void) aValue;
+ (void) rNativeBoundingRegion;
+ (void) rNativeContentRegion;
return sal_False;
}
diff --git a/vcl/ios/source/window/salframeview.mm b/vcl/ios/source/window/salframeview.mm
index 68c34a9..e92f1c2 100644
--- a/vcl/ios/source/window/salframeview.mm
+++ b/vcl/ios/source/window/salframeview.mm
@@ -44,9 +44,9 @@
-(id)initWithSalFrame: (IosSalFrame*)pFrame
{
mpFrame = pFrame;
+#if 0
CGRect aRect = { { pFrame->maGeometry.nX, pFrame->maGeometry.nY },
{ pFrame->maGeometry.nWidth, pFrame->maGeometry.nHeight } };
-#if 0
NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
[pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver
return pNSWindow;
@@ -67,7 +67,7 @@
if( pMutex )
{
pMutex->acquire();
- [super displayIfNeeded];
+ // ??? [super displayIfNeeded];
pMutex->release();
}
}
@@ -85,7 +85,8 @@
return YES;
if( (mpFrame->mnStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
return YES;
- return [super canBecomeKeyWindow];
+ // ??? return [super canBecomeKeyWindow];
+ return NO;
}
-(void)windowDidBecomeKey: (NSNotification*)pNotification
@@ -95,10 +96,11 @@
if( mpFrame && IosSalFrame::isAlive( mpFrame ) )
{
+#if 0
static const sal_uLong nGuessDocument = SAL_FRAME_STYLE_MOVEABLE|
SAL_FRAME_STYLE_SIZEABLE|
SAL_FRAME_STYLE_CLOSEABLE;
-
+#endif
mpFrame->CallCallback( SALEVENT_GETFOCUS, 0 );
mpFrame->SendPaintEvent(); // repaint controls as active
}
@@ -204,6 +206,7 @@
{
// ???
+ (void) pFrame;
mfLastMagnifyTime = 0.0;
return self;
}
@@ -257,8 +260,9 @@ private:
if( mpFrame->mpGraphics )
{
mpFrame->mpGraphics->UpdateWindow( aRect );
- if( mpFrame->getClipPath() )
- [mpFrame->getWindow() invalidateShadow];
+ if( mpFrame->getClipPath() ) {
+ // ??? [mpFrame->getWindow() invalidateShadow];
+ }
}
}
}
commit f85dfb96c407a68c5aa13815603c11ea8e340f6e
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 3 21:09:18 2012 +0300
WaE: unused parameter
diff --git a/boost/boost_1_44_0-unused-parameters.patch b/boost/boost_1_44_0-unused-parameters.patch
index 631e3e2..8f77a78 100644
--- a/boost/boost_1_44_0-unused-parameters.patch
+++ b/boost/boost_1_44_0-unused-parameters.patch
@@ -433,6 +433,23 @@
) const
{
this->act(ref,value_ref); // defined in ActionT
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/composite/no_actions.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/composite/no_actions.hpp
+@@ -38,10 +38,10 @@
+ template<typename ActorT, typename AttrT, typename IteratorT>
+ void
+ do_action(
+- ActorT const& actor,
+- AttrT& val,
+- IteratorT const& first,
+- IteratorT const& last) const
++ __attribute__ ((unused)) ActorT const& actor,
++ __attribute__ ((unused)) AttrT& val,
++ __attribute__ ((unused)) IteratorT const& first,
++ __attribute__ ((unused)) IteratorT const& last) const
+ {}
+ };
+
--- misc/boost_1_44_0/boost/spirit/home/classic/core/composite/impl/directives.ipp 2008-06-22 17:05:38.000000000 +0200
+++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/composite/impl/directives.ipp 2012-01-20 12:44:07.124316347 +0100
@@ -41,7 +41,7 @@
@@ -471,6 +488,17 @@
{
typedef scanner_policies<
inhibit_case_iteration_policy<
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/grammar.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/grammar.hpp
+@@ -83,7 +83,7 @@
+ { // Does _not_ copy the helpers member !
+ }
+
+- grammar_helper_list& operator=(grammar_helper_list const& x)
++ grammar_helper_list& operator=(__attribute__ ((unused)) grammar_helper_list const& x)
+ { // Does _not_ copy the helpers member !
+ return *this;
+ }
--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/parser_context.hpp 2008-06-22 17:05:38.000000000 +0200
+++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/parser_context.hpp 2012-01-20 12:44:07.124316347 +0100
@@ -51,15 +51,15 @@
@@ -603,6 +631,44 @@
NestedT const& nested_d)
{
typedef typename BinaryT::parser_generator_t binary_gen_t;
+@@ -324,7 +324,7 @@
+ >
+ static typename parser_result<ParserT, ScannerT>::type
+ parse(ParserT const &, ScannerT const& scan, ActionT const &action,
+- NestedT const& nested_d)
++ __attribute__ ((unused)) NestedT const& nested_d)
+ {
+ return action.parse(scan);
+ }
+--- misc/boost_1_44_0/boost/spirit/home/classic/utility/impl/chset.ipp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/impl/chset.ipp
+@@ -129,7 +129,7 @@
+ }
+
+ template <typename CharT>
+-inline chset<CharT>::chset(nothing_parser arg_)
++inline chset<CharT>::chset(__attribute__ ((unused)) nothing_parser arg_)
+ : ptr(new basic_chset<CharT>()) {}
+
+ template <typename CharT>
+@@ -182,7 +182,7 @@
+
+ template <typename CharT>
+ inline chset<CharT>&
+-chset<CharT>::operator=(anychar_parser rhs)
++chset<CharT>::operator=(__attribute__ ((unused)) anychar_parser rhs)
+ {
+ utility::impl::detach_clear(ptr);
+ ptr->set(
+@@ -194,7 +194,7 @@
+
+ template <typename CharT>
+ inline chset<CharT>&
+-chset<CharT>::operator=(nothing_parser rhs)
++chset<CharT>::operator=(__attribute__ ((unused)) nothing_parser rhs)
+ {
+ utility::impl::detach_clear(ptr);
+ return *this;
--- misc/boost_1_44_0/boost/spirit/home/classic/utility/impl/chset_operators.ipp 2008-06-22 17:05:38.000000000 +0200
+++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/impl/chset_operators.ipp 2012-01-20 12:44:07.127316333 +0100
@@ -576,7 +576,7 @@
@@ -638,6 +704,17 @@
{
return (
(item - delim)
+--- misc/boost_1_44_0/boost/spirit/home/classic/phoenix/tuples.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/phoenix/tuples.hpp
+@@ -211,7 +211,7 @@
+ typedef nil_t& rtype;
+ typedef nil_t const& crtype;
+
+- static nil_t get(TupleT const& t) { return nil_t(); }
++ static nil_t get(__attribute__ ((unused)) TupleT const& t) { return nil_t(); }
+ };
+
+ //////////////////////////////////
--- misc/boost_1_44_0/boost/throw_exception.hpp 2010-07-03 23:32:02.000000000 +0200
+++ misc/build/boost_1_44_0/boost/throw_exception.hpp 2012-01-20 12:44:07.127316333 +0100
@@ -49,7 +49,7 @@
More information about the Libreoffice-commits
mailing list