You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [38/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/toolkit/source/helper/servicenames.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/source/helper/servicenames.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/source/helper/servicenames.cxx (original)
+++ openoffice/branches/l10n/main/toolkit/source/helper/servicenames.cxx Sun Feb 3 13:23:59 2013
@@ -87,13 +87,9 @@ const sal_Char __FAR_DATA szServiceName_
const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
-const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel";
const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[] = "com.sun.star.awt.AnimatedImagesControl";
const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[] = "com.sun.star.awt.AnimatedImagesControlModel";
const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[] = "com.sun.star.awt.SpinningProgressControlModel";
-const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation";
-const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[] = "com.sun.star.awt.UnoThrobberControlModel", szServiceName2_UnoThrobberControlModel[] = "com.sun.star.awt.UnoControlThrobberModel";
-const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl", szServiceName2_UnoThrobberControl[] = "com.sun.star.awt.UnoControlThrobber";
const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
const sal_Char __FAR_DATA szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
Modified: openoffice/branches/l10n/main/toolkit/source/helper/vclunohelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/source/helper/vclunohelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/source/helper/vclunohelper.cxx (original)
+++ openoffice/branches/l10n/main/toolkit/source/helper/vclunohelper.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
@@ -42,9 +40,7 @@
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/embed/EmbedMapUnits.hpp>
-
#include <com/sun/star/graphic/XGraphic.hpp>
-
#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <toolkit/awt/vclxbitmap.hxx>
@@ -55,12 +51,11 @@
#include <toolkit/awt/vclxfont.hxx>
#include <toolkit/controls/unocontrolcontainer.hxx>
#include <toolkit/controls/unocontrolcontainermodel.hxx>
-
#include <vcl/graph.hxx>
#include <comphelper/processfactory.hxx>
-
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Point.hpp>
+#include <vcl/dibtools.hxx>
using namespace ::com::sun::star;
@@ -101,12 +96,12 @@ BitmapEx VCLUnoHelper::GetBitmap( const
{
::com::sun::star::uno::Sequence<sal_Int8> aBytes = rxBitmap->getDIB();
SvMemoryStream aMem( (char*) aBytes.getArray(), aBytes.getLength(), STREAM_READ );
- aMem >> aDIB;
+ ReadDIB(aDIB, aMem, true);
}
{
::com::sun::star::uno::Sequence<sal_Int8> aBytes = rxBitmap->getMaskDIB();
SvMemoryStream aMem( (char*) aBytes.getArray(), aBytes.getLength(), STREAM_READ );
- aMem >> aMask;
+ ReadDIB(aMask, aMem, true);
}
aBmp = BitmapEx( aDIB, aMask );
}
Modified: openoffice/branches/l10n/main/toolkit/source/layout/core/root.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/source/layout/core/root.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/source/layout/core/root.cxx (original)
+++ openoffice/branches/l10n/main/toolkit/source/layout/core/root.cxx Sun Feb 3 13:23:59 2013
@@ -82,10 +82,9 @@ void ShowMessageBox( uno::Reference< lan
uno::Reference< awt::XWindowPeer > xWindowPeer( xContainerWindow, uno::UNO_QUERY_THROW );
uno::Reference< awt::XMessageBoxFactory > xMessageBoxFactory( xToolkit, uno::UNO_QUERY );
- awt::Rectangle aRectangle;
uno::Reference< awt::XMessageBox > xMessageBox
= xMessageBoxFactory->createMessageBox
- ( xWindowPeer, aRectangle, OUString::createFromAscii( "errorbox" ),
+ ( xWindowPeer, awt::MessageBoxType_ERRORBOX,
awt::MessageBoxButtons::BUTTONS_OK, aTitle, aMessage );
if ( xMessageBox.is() )
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/boxer.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/boxer.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/boxer.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/boxer.py Sun Feb 3 13:23:59 2013
@@ -31,7 +31,7 @@ class DlgLayoutBuilder(object):
def addWidget (self, elem):
x, y = int(elem.getAttr('x')), int(elem.getAttr('y'))
self.rows[y] = self.rows.get (y, {})
- while self.rows[y].has_key(x):
+ while x in self.rows[y]:
y += 1
self.rows[y] = self.rows.get (y, {})
self.rows[y][x] = elem
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/expression.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/expression.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/expression.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/expression.py Sun Feb 3 13:23:59 2013
@@ -125,4 +125,4 @@ class ExpParser(object):
def dumpTree (self):
self.jumpToRoot()
- print toString(self.ptr)
+ print(toString(self.ptr))
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/globals.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/globals.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/globals.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/globals.py Sun Feb 3 13:23:59 2013
@@ -108,7 +108,7 @@ class Element(Node):
return chars
def hasAttr (self, name):
- return self.attrs.has_key(name)
+ return name in self.attrs
def getAttr (self, name):
return self.attrs[name]
@@ -121,7 +121,7 @@ class Element(Node):
return
def clone (self, elem):
- keys = elem.attrs.keys()
+ keys = list(elem.attrs.keys())
for key in keys:
self.attrs[key] = elem.attrs[key]
self.rid = elem.rid
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/macroexpander_test.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/macroexpander_test.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/macroexpander_test.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/macroexpander_test.py Sun Feb 3 13:23:59 2013
@@ -31,7 +31,7 @@ class TestCase:
mcExpander.debug = True
mcExpander.expand()
tokens = mcExpander.getTokens()
- print tokens
+ print(tokens)
@staticmethod
def simpleNoArgs ():
@@ -79,13 +79,13 @@ class TestCase:
TestCase.run(tokens, defines)
def main ():
- print "simple expansion with no arguments"
+ print("simple expansion with no arguments")
TestCase.simpleNoArgs()
- print "simple argument expansion"
+ print("simple argument expansion")
TestCase.simpleArgs()
- print "multi-token argument expansion"
+ print("multi-token argument expansion")
TestCase.multiTokenArgs()
- print "nested argument expansion"
+ print("nested argument expansion")
TestCase.nestedTokenArgs()
if __name__ == '__main__':
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/macroparser.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/macroparser.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/macroparser.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/macroparser.py Sun Feb 3 13:23:59 2013
@@ -37,8 +37,8 @@ A macro with arguments must have its ope
its name without any whitespace.
"""
if self.debug:
- print "-"*68
- print "parsing '%s'"%self.buffer
+ print("-"*68)
+ print("parsing '%s'"%self.buffer)
i = 0
bufSize = len(self.buffer)
@@ -105,17 +105,17 @@ character is the open paren.
def setMacro (self, name, vars, content):
if self.debug:
- print "-"*68
- print "name: %s"%name
+ print("-"*68)
+ print("name: %s"%name)
for var in vars:
- print "var: %s"%var
+ print("var: %s"%var)
if len(vars) == 0:
- print "no vars"
- print "content: '%s'"%content
+ print("no vars")
+ print("content: '%s'"%content)
if len(content) > 0:
self.macro = Macro(name)
- for i in xrange(0, len(vars)):
+ for i in range(0, len(vars)):
self.macro.vars[vars[i]] = i
# tokinize it using lexer.
@@ -125,16 +125,16 @@ character is the open paren.
mclexer.tokenize()
self.macro.tokens = mclexer.getTokens()
if self.debug:
- print self.macro.tokens
+ print(self.macro.tokens)
if not self.isValidMacro(self.macro):
self.macro = None
if self.debug:
if self.macro != None:
- print "macro registered!"
+ print("macro registered!")
else:
- print "macro not registered"
+ print("macro not registered")
def isValidMacro (self, macro):
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/src2xml.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/src2xml.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/src2xml.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/src2xml.py Sun Feb 3 13:23:59 2013
@@ -182,12 +182,12 @@ def dry_one_file (file_name, options):
try:
str = convert(file_name, options)
progress (" SUCCESS\n")
- except Exception, e:
+ except Exception as e:
if options.keep_going:
progress (" FAILED\n")
else:
import traceback
- print traceback.format_exc (None)
+ print(traceback.format_exc (None))
raise e
def post_process (s):
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/srclexer.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/srclexer.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/srclexer.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/srclexer.py Sun Feb 3 13:23:59 2013
@@ -303,14 +303,14 @@ build the syntax tree.
self.handleMacroInclude(buf)
elif command == 'ifdef':
defineName = buf.strip()
- if self.defines.has_key(defineName):
+ if defineName in self.defines:
self.visibilityStack.append(SrcLexer.VISIBLE)
else:
self.visibilityStack.append(SrcLexer.INVISIBLE_PRE)
elif command == 'ifndef':
defineName = buf.strip()
- if self.defines.has_key(defineName):
+ if defineName in self.defines:
self.visibilityStack.append(SrcLexer.INVISIBLE_PRE)
else:
self.visibilityStack.append(SrcLexer.VISIBLE)
@@ -351,8 +351,8 @@ build the syntax tree.
elif command in ['error', 'pragma']:
pass
else:
- print "'%s' '%s'"%(command, buf)
- print self.filepath
+ print("'%s' '%s'"%(command, buf))
+ print(self.filepath)
sys.exit(0)
return i
@@ -407,10 +407,10 @@ build the syntax tree.
progress ("%s already included\n"%headerPath)
return
- if SrcLexer.headerCache.has_key(headerPath):
+ if headerPath in SrcLexer.headerCache:
if self.debug:
progress ("%s in cache\n"%headerPath)
- for key in SrcLexer.headerCache[headerPath].defines.keys():
+ for key in list(SrcLexer.headerCache[headerPath].defines.keys()):
self.defines[key] = SrcLexer.headerCache[headerPath].defines[key]
return
@@ -422,7 +422,7 @@ build the syntax tree.
hdrData = HeaderData()
hdrData.tokens = mclexer.getTokens()
headerDefines = mclexer.getDefines()
- for key in headerDefines.keys():
+ for key in list(headerDefines.keys()):
defines[key] = headerDefines[key]
hdrData.defines[key] = headerDefines[key]
@@ -430,15 +430,15 @@ build the syntax tree.
SrcLexer.headerCache[headerPath] = hdrData
# Update the list of headers that have already been expaneded.
- for key in mclexer.headerDict.keys():
+ for key in list(mclexer.headerDict.keys()):
self.headerDict[key] = True
if self.debug:
progress ("defines found in header %s:\n"%headerSub)
- for key in defines.keys():
+ for key in list(defines.keys()):
progress (" '%s'\n"%key)
- for key in defines.keys():
+ for key in list(defines.keys()):
self.defines[key] = defines[key]
Modified: openoffice/branches/l10n/main/toolkit/src2xml/source/srcparser.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/source/srcparser.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/source/srcparser.py (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/source/srcparser.py Sun Feb 3 13:23:59 2013
@@ -108,12 +108,12 @@ class MacroExpander(object):
def expandToken (self):
token = self.tokens[self.pos]
- if not self.defines.has_key(token):
+ if token not in self.defines:
self.pos += 1
return
macro = self.defines[token]
- nvars = len(macro.vars.keys())
+ nvars = len(list(macro.vars.keys()))
if nvars == 0:
# Simple expansion
self.tokens[self.pos:self.pos+1] = macro.tokens
@@ -123,7 +123,7 @@ class MacroExpander(object):
values, lastPos = self.parseValues()
newtokens = []
for mtoken in macro.tokens:
- if macro.vars.has_key(mtoken):
+ if mtoken in macro.vars:
# variable
pos = macro.vars[mtoken]
valtokens = values[pos]
@@ -155,15 +155,15 @@ words, whitespace does not end a token.
tk = self.tokens[self.pos+i]
except IndexError:
progress ("error parsing values (%d)\n"%i)
- for j in xrange(0, i):
- print self.tokens[self.pos+j],
- print ''
+ for j in range(0, i):
+ print(self.tokens[self.pos+j], end=' ')
+ print('')
srclexer.dumpTokens(self.tokens)
srclexer.dumpTokens(self.newtokens)
- print "tokens expanded so far:"
+ print("tokens expanded so far:")
for tk in self.expandedTokens:
- print "-"*20
- print tk
+ print("-"*20)
+ print(tk)
srclexer.dumpTokens(self.defines[tk].tokens)
sys.exit(1)
if tk == '(':
@@ -207,7 +207,7 @@ class SrcParser(object):
# Expand defined macros.
if self.debug:
progress ("-"*68+"\n")
- for key in self.defines.keys():
+ for key in list(self.defines.keys()):
progress ("define: %s\n"%key)
self.expandMacro()
@@ -314,7 +314,7 @@ handler.
def closeBrace (self, i):
if len(self.tokenBuf) > 0:
if self.debug:
- print self.tokenBuf
+ print(self.tokenBuf)
raise ParseError ('')
self.elementStack.pop()
return i
Modified: openoffice/branches/l10n/main/toolkit/src2xml/src.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/src2xml/src.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/src2xml/src.lst (original)
+++ openoffice/branches/l10n/main/toolkit/src2xml/src.lst Sun Feb 3 13:23:59 2013
@@ -617,8 +617,6 @@
../../filter/source/xsltdialog/xmlfiltertabpagexslt.src
../../filter/source/xsltdialog/xmlfiltertestdialog.src
../../filter/source/xsltdialog/xmlfiltertabpagebasic.src
-../../toolkit/source/awt/accessiblestrings.src
-../../toolkit/source/awt/xthrobber.src
../../xmlsecurity/source/dialogs/warnings.src
../../xmlsecurity/source/dialogs/macrosecurity.src
../../xmlsecurity/source/dialogs/certificatechooser.src
Modified: openoffice/branches/l10n/main/toolkit/util/tk.component
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/util/tk.component?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/util/tk.component (original)
+++ openoffice/branches/l10n/main/toolkit/util/tk.component Sun Feb 3 13:23:59 2013
@@ -260,14 +260,6 @@
<service name="com.sun.star.awt.UnoControlScrollBar"/>
<service name="stardiv.vcl.control.ScrollBar"/>
</implementation>
- <implementation name="stardiv.Toolkit.UnoSimpleAnimationControl">
- <service name="com.sun.star.awt.UnoControlSimpleAnimation"/>
- <service name="com.sun.star.awt.UnoSimpleAnimationControl"/>
- </implementation>
- <implementation name="stardiv.Toolkit.UnoSimpleAnimationControlModel">
- <service name="com.sun.star.awt.UnoControlSimpleAnimationModel"/>
- <service name="com.sun.star.awt.UnoSimpleAnimationControlModel"/>
- </implementation>
<implementation name="org.openoffice.comp.toolkit.SpinningProgressControlModel">
<service name="com.sun.star.awt.SpinningProgressControlModel"/>
</implementation>
@@ -283,14 +275,6 @@
<implementation name="stardiv.Toolkit.UnoSpinButtonModel">
<service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
</implementation>
- <implementation name="stardiv.Toolkit.UnoThrobberControl">
- <service name="com.sun.star.awt.UnoControlThrobber"/>
- <service name="com.sun.star.awt.UnoThrobberControl"/>
- </implementation>
- <implementation name="stardiv.Toolkit.UnoThrobberControlModel">
- <service name="com.sun.star.awt.UnoControlThrobberModel"/>
- <service name="com.sun.star.awt.UnoThrobberControlModel"/>
- </implementation>
<implementation name="stardiv.Toolkit.UnoTimeFieldControl">
<service name="com.sun.star.awt.UnoControlTimeField"/>
<service name="stardiv.vcl.control.TimeField"/>
Modified: openoffice/branches/l10n/main/toolkit/util/toolkit.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/util/toolkit.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/util/toolkit.xml (original)
+++ openoffice/branches/l10n/main/toolkit/util/toolkit.xml Sun Feb 3 13:23:59 2013
@@ -646,46 +646,6 @@
<supported-service>com.sun.star.awt.UnoControlSpinButton</supported-service>
</component-description>
<component-description>
- <author>Dirk Voelzke</author>
- <name>com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel</name>
- <description>specifies the model of a simple animation control</description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>c++</language>
- <status value="final" />
- <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
- <supported-service>com.sun.star.awt.UnoSimpleAnimationControlModel</supported-service>
- </component-description>
- <component-description>
- <author>Dirk Voelzke</author>
- <name>com.sun.star.comp.toolkit.UnoSimpleAnimationControl</name>
- <description>specifies a simple animation control</description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>c++</language>
- <status value="final" />
- <supported-service>com.sun.star.awt.UnoControl</supported-service>
- <supported-service>com.sun.star.awt.UnoSimpleAnimationControl</supported-service>
- </component-description>
- <component-description>
- <author>Dirk Voelzke</author>
- <name>com.sun.star.comp.toolkit.UnoThrobberControlModel</name>
- <description>specifies the model of a throbber control (a spinning wheel)</description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>c++</language>
- <status value="final" />
- <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
- <supported-service>com.sun.star.awt.UnoThrobberControlModel</supported-service>
- </component-description>
- <component-description>
- <author>Dirk Voelzke</author>
- <name>com.sun.star.comp.toolkit.UnoThrobberControl</name>
- <description>specifies a throbber control (a spinning wheel)</description>
- <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
- <language>c++</language>
- <status value="final" />
- <supported-service>com.sun.star.awt.UnoControl</supported-service>
- <supported-service>com.sun.star.awt.UnoThrobberControl</supported-service>
- </component-description>
- <component-description>
<author>Christian Lippka</author>
<name>stardiv.Toolkit.UnoTreeModel</name>
<description>specifies the model of a tree control</description>
Modified: openoffice/branches/l10n/main/tools/test/tests.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/tools/test/tests.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/tools/test/tests.cxx (original)
+++ openoffice/branches/l10n/main/tools/test/tests.cxx Sun Feb 3 13:23:59 2013
@@ -21,7 +21,6 @@
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_tools.hxx"
// autogenerated file with codegen.pl
Modified: openoffice/branches/l10n/main/ucb/source/ucp/file/bc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ucb/source/ucp/file/bc.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/ucb/source/ucp/file/bc.cxx (original)
+++ openoffice/branches/l10n/main/ucb/source/ucp/file/bc.cxx Sun Feb 3 13:23:59 2013
@@ -1186,7 +1186,7 @@ void SAL_CALL BaseContent::insert( sal_I
// Inserts the content, which has the flag m_bIsFresh
- if( ! m_nState & NameForInsertionSet )
+ if ( !m_nState | !NameForInsertionSet )
{
m_pMyShell->installError( nMyCommandIdentifier,
TASKHANDLING_NONAMESET_INSERT_COMMAND );
Modified: openoffice/branches/l10n/main/ucb/source/ucp/ftp/test.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ucb/source/ucp/ftp/test.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/ucb/source/ucp/ftp/test.py (original)
+++ openoffice/branches/l10n/main/ucb/source/ucp/ftp/test.py Sun Feb 3 13:23:59 2013
@@ -29,7 +29,7 @@ def grep(pattern,dirname,names):
lines = open(filename,"r").readlines()
for line in lines:
if pattern.search(line):
- print filename
+ print(filename)
break
Modified: openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx (original)
+++ openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx Sun Feb 3 13:23:59 2013
@@ -54,7 +54,7 @@ void SerfRequestProcessorImpl::activateC
mbUseChunkedEncoding = true;
}
-const bool SerfRequestProcessorImpl::useChunkedEncoding() const
+bool SerfRequestProcessorImpl::useChunkedEncoding() const
{
return mbUseChunkedEncoding;
}
Modified: openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx (original)
+++ openoffice/branches/l10n/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx Sun Feb 3 13:23:59 2013
@@ -66,7 +66,7 @@ protected:
void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) = 0;
const char* getPathStr() const;
- const bool useChunkedEncoding() const;
+ bool useChunkedEncoding() const;
private:
const char* mPathStr;
Modified: openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.cxx (original)
+++ openoffice/branches/l10n/main/ucb/source/ucp/webdav/webdavresponseparser.cxx Sun Feb 3 13:23:59 2013
@@ -180,8 +180,8 @@ namespace
const ::rtl::OUString& getNamespace() const { return maNamespace; }
const ::rtl::OUString& getName() const { return maName; }
- const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; }
- const WebDAVName getWebDAVName() const { return maWebDAVName; }
+ WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; }
+ WebDAVName getWebDAVName() const { return maWebDAVName; }
};
void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs)
Modified: openoffice/branches/l10n/main/unoil/climaker/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/unoil/climaker/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/unoil/climaker/makefile.mk (original)
+++ openoffice/branches/l10n/main/unoil/climaker/makefile.mk Sun Feb 3 13:23:59 2013
@@ -64,8 +64,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
$(CLIMAKER) $(CLIMAKERFLAGS) \
--out $@ \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
- --assembly-company "OpenOffice.org" \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+ --assembly-company "Apache OpenOffice" \
+ --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
-X $(EXTRA_RDB) \
-r $(SOLARBINDIR)$/cli_uretypes.dll \
--keyfile $(SOLARBINDIR)$/cliuno.snk \
Modified: openoffice/branches/l10n/main/unotools/source/config/inetoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/unotools/source/config/inetoptions.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/unotools/source/config/inetoptions.cxx (original)
+++ openoffice/branches/l10n/main/unotools/source/config/inetoptions.cxx Sun Feb 3 13:23:59 2013
@@ -38,7 +38,6 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XProxySettings.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
Modified: openoffice/branches/l10n/main/uui/source/newerverwarn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/uui/source/newerverwarn.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/uui/source/newerverwarn.cxx (original)
+++ openoffice/branches/l10n/main/uui/source/newerverwarn.cxx Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
@@ -98,12 +98,9 @@ IMPL_LINK( NewerVersionWarningDialog, Up
{
if ( ( sNotifyURL.getLength() > 0 ) && ( m_sVersion.getLength() > 0 ) )
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
sNotifyURL += m_sVersion;
if ( xSystemShell.is() && sNotifyURL.getLength() )
{
Modified: openoffice/branches/l10n/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/Library_vcl.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/l10n/main/vcl/Library_vcl.mk Sun Feb 3 13:23:59 2013
@@ -321,7 +321,6 @@ $(eval $(call gb_Library_add_exception_o
vcl/source/gdi/alpha \
vcl/source/gdi/animate \
vcl/source/gdi/base14 \
- vcl/source/gdi/bitmap2 \
vcl/source/gdi/bitmap3 \
vcl/source/gdi/bitmap4 \
vcl/source/gdi/bitmap \
@@ -334,6 +333,7 @@ $(eval $(call gb_Library_add_exception_o
vcl/source/gdi/configsettings \
vcl/source/gdi/cvtgrf \
vcl/source/gdi/cvtsvm \
+ vcl/source/gdi/dibtools \
vcl/source/gdi/extoutdevdata \
vcl/source/gdi/font \
vcl/source/gdi/gdimtf \
Modified: openoffice/branches/l10n/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/Library_vclplug_gen.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/Library_vclplug_gen.mk (original)
+++ openoffice/branches/l10n/main/vcl/Library_vclplug_gen.mk Sun Feb 3 13:23:59 2013
@@ -124,7 +124,6 @@ $(eval $(call gb_Library_set_defs,vclplu
ifeq ($(XRANDR_DLOPEN),FALSE)
$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
$$(CXXFLAGS) \
- $$(XRANDR_CFLAGS) \
))
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
Modified: openoffice/branches/l10n/main/vcl/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/Package_inc.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/Package_inc.mk (original)
+++ openoffice/branches/l10n/main/vcl/Package_inc.mk Sun Feb 3 13:23:59 2013
@@ -30,6 +30,7 @@ $(eval $(call gb_Package_add_file,vcl_in
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/arrange.hxx,vcl/arrange.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dibtools.hxx,vcl/dibtools.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/btndlg.hxx,vcl/btndlg.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/button.hxx,vcl/button.hxx))
Modified: openoffice/branches/l10n/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx Sun Feb 3 13:23:59 2013
@@ -125,8 +125,8 @@ namespace // private
{
{ NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", CPPUTYPE_OUSTRING },
{ NSRTFPboardType, "text/richtext", "Rich Text Format", CPPUTYPE_SEQINT8 },
- { NSTIFFPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
- { NSPICTPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
+ { NSTIFFPboardType, "image/png", "Portable Network Graphics", CPPUTYPE_SEQINT8 },
+ { NSPICTPboardType, "image/png", "Portable Network Graphics", CPPUTYPE_SEQINT8 },
{ NSHTMLPboardType, "text/html", "Plain Html", CPPUTYPE_SEQINT8 },
{ NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", CPPUTYPE_SEQINT8 },
{ PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", CPPUTYPE_SEQINT8 },
@@ -371,73 +371,65 @@ Any HTMLFormatDataProvider::getOOoData()
//###########################
-class BMPDataProvider : public DataProviderBaseImpl
+class PNGDataProvider : public DataProviderBaseImpl
{
- NSBitmapImageFileType meImageType;
+ NSBitmapImageFileType meImageType;
public:
- BMPDataProvider(const Any& data, NSBitmapImageFileType eImageType );
+ PNGDataProvider( const Any&, NSBitmapImageFileType);
- BMPDataProvider(NSData* data, NSBitmapImageFileType eImageType);
+ PNGDataProvider( NSData*, NSBitmapImageFileType);
- virtual NSData* getSystemData();
+ virtual NSData* getSystemData();
- virtual Any getOOoData();
+ virtual Any getOOoData();
};
-BMPDataProvider::BMPDataProvider(const Any& data, NSBitmapImageFileType eImageType) :
+PNGDataProvider::PNGDataProvider( const Any& data, NSBitmapImageFileType eImageType) :
DataProviderBaseImpl(data),
meImageType( eImageType )
{
}
-BMPDataProvider::BMPDataProvider(NSData* data, NSBitmapImageFileType eImageType) :
+PNGDataProvider::PNGDataProvider( NSData* data, NSBitmapImageFileType eImageType) :
DataProviderBaseImpl(data),
meImageType( eImageType )
{
}
-NSData* BMPDataProvider::getSystemData()
+NSData* PNGDataProvider::getSystemData()
{
- Sequence<sal_Int8> bmpData;
- mData >>= bmpData;
+ Sequence<sal_Int8> pngData;
+ mData >>= pngData;
- Sequence<sal_Int8> pictData;
- NSData* sysData = NULL;
+ Sequence<sal_Int8> imgData;
+ NSData* sysData = NULL;
+ if( PNGToImage( pngData, imgData, meImageType))
+ sysData = [NSData dataWithBytes: imgData.getArray() length: imgData.getLength()];
- if (BMPToImage(bmpData, pictData, meImageType))
- {
- sysData = [NSData dataWithBytes: pictData.getArray() length: pictData.getLength()];
- }
-
- return sysData;
+ return sysData;
}
-/* At the moment the OOo 'PCT' filter is not good enough to be used
- and there is no flavor defined for exchanging 'PCT' with OOo so
- we will at the moment convert 'PCT' to a Windows BMP and provide
- this to OOo
+/* The AOO 'PCT' filter is not yet good enough to be used
+ and there is no flavor defined for exchanging 'PCT' with AOO
+ so we convert 'PCT' to a PNG and provide this to AOO
*/
-Any BMPDataProvider::getOOoData()
+Any PNGDataProvider::getOOoData()
{
- Any oOOData;
+ Any oOOData;
- if (mSystemData)
+ if( mSystemData)
{
- unsigned int flavorDataLength = [mSystemData length];
- Sequence<sal_Int8> pictData(flavorDataLength);
-
- memcpy(pictData.getArray(), [mSystemData bytes], flavorDataLength);
+ const unsigned int flavorDataLength = [mSystemData length];
+ Sequence<sal_Int8> imgData( flavorDataLength);
+ memcpy( imgData.getArray(), [mSystemData bytes], flavorDataLength);
- Sequence<sal_Int8> bmpData;
-
- if (ImageToBMP(pictData, bmpData, meImageType))
- {
- oOOData = makeAny(bmpData);
- }
+ Sequence<sal_Int8> pngData;
+ if( ImageToPNG( imgData, pngData, meImageType))
+ oOOData = makeAny( pngData);
}
- else
+ else
{
- oOOData = mData;
+ oOOData = mData;
}
return oOOData;
@@ -617,11 +609,11 @@ DataProviderPtr_t DataFlavorMapper::getD
*/
if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == NSOrderedSame)
{
- dp = DataProviderPtr_t(new BMPDataProvider(data, PICTImageFileType));
+ dp = DataProviderPtr_t( new PNGDataProvider( data, PICTImageFileType));
}
else if ([systemFlavor caseInsensitiveCompare: NSTIFFPboardType] == NSOrderedSame)
{
- dp = DataProviderPtr_t(new BMPDataProvider(data, NSTIFFFileType));
+ dp = DataProviderPtr_t( new PNGDataProvider( data, NSTIFFFileType));
}
else if ([systemFlavor caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
{
@@ -666,11 +658,11 @@ DataProviderPtr_t DataFlavorMapper::getD
}
else if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == NSOrderedSame)
{
- dp = DataProviderPtr_t(new BMPDataProvider(systemData, PICTImageFileType));
+ dp = DataProviderPtr_t( new PNGDataProvider(systemData, PICTImageFileType));
}
else if ([systemFlavor caseInsensitiveCompare: NSTIFFPboardType] == NSOrderedSame)
{
- dp = DataProviderPtr_t(new BMPDataProvider(systemData, NSTIFFFileType));
+ dp = DataProviderPtr_t( new PNGDataProvider(systemData, NSTIFFFileType));
}
else if ([systemFlavor caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
{
Modified: openoffice/branches/l10n/main/vcl/aqua/source/dtrans/OSXTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/dtrans/OSXTransferable.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/dtrans/OSXTransferable.cxx (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/dtrans/OSXTransferable.cxx Sun Feb 3 13:23:59 2013
@@ -85,7 +85,7 @@ Any SAL_CALL OSXTransferable::getTransfe
}
NSString* sysFormat =
- (aFlavor.MimeType.compareToAscii( "image/bmp", 9 ) == 0)
+ (aFlavor.MimeType.compareToAscii( "image/png", 9 ) == 0)
? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
: mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor);
DataProviderPtr_t dp;
Modified: openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx Sun Feb 3 13:23:59 2013
@@ -36,159 +36,130 @@
#include "PictToBmpFlt.hxx"
-bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
- com::sun::star::uno::Sequence<sal_Int8>& aBmp)
+bool PICTtoPNG( com::sun::star::uno::Sequence<sal_Int8>& rPictData,
+ com::sun::star::uno::Sequence<sal_Int8>& rPngData)
{
-
- bool result = false;
-
- ComponentInstance bmpExporter;
- if (OpenADefaultComponent(GraphicsExporterComponentType,
- kQTFileTypeBMP,
- &bmpExporter) != noErr)
- {
- return result;
- }
-
- Handle hPict;
- if (PtrToHand(aPict.getArray(), &hPict, aPict.getLength()) != noErr)
- {
- return result;
- }
-
- Handle hBmp;
- if ((GraphicsExportSetInputPicture(bmpExporter, (PicHandle)hPict) != noErr) ||
- ((hBmp = NewHandleClear(0)) == NULL))
- {
- CloseComponent(bmpExporter);
- DisposeHandle(hPict);
- return result;
- }
-
- if ((GraphicsExportSetOutputHandle(bmpExporter, hBmp) == noErr) &&
- (GraphicsExportDoExport(bmpExporter, NULL) == noErr))
- {
- size_t sz = GetHandleSize(hBmp);
- aBmp.realloc(sz);
-
- HLock(hBmp);
- rtl_copyMemory(aBmp.getArray(), ((sal_Int8*)*hBmp), sz);
- HUnlock(hBmp);
-
- result = true;
+ ComponentInstance pngExporter = NULL;
+ if( OpenADefaultComponent( GraphicsExporterComponentType, kQTFileTypePNG, &pngExporter) != noErr)
+ return false;
+
+ Handle hPict = NULL;
+ if( PtrToHand( rPictData.getArray(), &hPict, rPictData.getLength()) != noErr)
+ hPict = NULL;
+
+ Handle hPng = NULL;
+ if( hPict && GraphicsExportSetInputPicture( pngExporter, (PicHandle)hPict) == noErr)
+ hPng = NewHandleClear(0);
+
+ size_t nPngSize = 0;
+ if( hPng
+ && (GraphicsExportSetOutputHandle( pngExporter, hPng) == noErr)
+ && (GraphicsExportDoExport( pngExporter, NULL) == noErr))
+ {
+ nPngSize = GetHandleSize( hPng);
+ rPngData.realloc( nPngSize);
+
+ HLock( hPng);
+ rtl_copyMemory( rPngData.getArray(), ((sal_Int8*)*hPng), nPngSize);
+ HUnlock( hPng);
}
- DisposeHandle(hPict);
- DisposeHandle(hBmp);
- CloseComponent(bmpExporter);
+ if( hPict)
+ DisposeHandle( hPict);
+ if( hPng)
+ DisposeHandle( hPng);
+ if( pngExporter)
+ CloseComponent( pngExporter);
- return result;
+ return (nPngSize > 0);
}
-bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
- com::sun::star::uno::Sequence<sal_Int8>& aPict)
-{
- bool result = false;
- Handle hBmp;
- ComponentInstance pictExporter;
- if ((PtrToHand(aBmp.getArray(), &hBmp, aBmp.getLength()) != noErr))
- {
- return result;
- }
-
- if (OpenADefaultComponent(GraphicsImporterComponentType,
- kQTFileTypeBMP,
- &pictExporter) != noErr)
- {
- DisposeHandle(hBmp);
- return result;
- }
+bool PNGtoPICT( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+ com::sun::star::uno::Sequence<sal_Int8>& rPictData)
+{
+ ComponentInstance pictExporter;
+ if( OpenADefaultComponent( GraphicsImporterComponentType, kQTFileTypePNG, &pictExporter) != noErr)
+ return false;
+
+ Handle hPng = NULL;
+ if( PtrToHand( rPngData.getArray(), &hPng, rPngData.getLength()) != noErr)
+ hPng = NULL;
- if (GraphicsImportSetDataHandle(pictExporter, hBmp) != noErr)
- {
- DisposeHandle(hBmp);
- CloseComponent(pictExporter);
- return result;
- }
-
- PicHandle hPict;
- if (GraphicsImportGetAsPicture(pictExporter, &hPict) == noErr)
- {
- size_t sz = GetHandleSize((Handle)hPict);
- aPict.realloc(sz);
-
- HLock((Handle)hPict);
- rtl_copyMemory(aPict.getArray(), ((sal_Int8*)*hPict), sz);
- HUnlock((Handle)hPict);
-
- // Release the data associated with the picture
- // Note: This function is deprecated in Mac OS X
- // 10.4.
- KillPicture(hPict);
-
- result = true;
+ size_t nPictSize = 0;
+ PicHandle hPict = NULL;
+ if( hPng
+ && (GraphicsImportSetDataHandle( pictExporter, hPng) == noErr)
+ && (GraphicsImportGetAsPicture( pictExporter, &hPict) == noErr))
+ {
+ nPictSize = GetHandleSize( (Handle)hPict);
+ rPictData.realloc( nPictSize);
+
+ HLock( (Handle)hPict);
+ rtl_copyMemory( rPictData.getArray(), ((sal_Int8*)*hPict), nPictSize);
+ HUnlock( (Handle)hPict);
+
+ // Release the data associated with the picture
+ // Note: This function is deprecated in Mac OSX 10.4
+ KillPicture( hPict);
}
- DisposeHandle(hBmp);
- CloseComponent(pictExporter);
+ if( hPng)
+ DisposeHandle( hPng);
+ if( pictExporter)
+ CloseComponent( pictExporter);
- return result;
+ return (nPictSize > 512);
}
-bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
- com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+ com::sun::star::uno::Sequence<sal_Int8>& rPngData,
NSBitmapImageFileType eInFormat)
{
- if( eInFormat == PICTImageFileType )
- return PICTtoBMP( aPict, aBmp );
-
- bool bResult = false;
-
- NSData* pData = [NSData dataWithBytesNoCopy: (void*)aPict.getConstArray() length: aPict.getLength() freeWhenDone: 0];
- if( pData )
- {
- NSBitmapImageRep* pRep = [NSBitmapImageRep imageRepWithData: pData];
- if( pRep )
- {
- NSData* pOut = [pRep representationUsingType: NSBMPFileType properties: nil];
- if( pOut )
- {
- aBmp.realloc( [pOut length] );
- [pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
- bResult = (aBmp.getLength() != 0);
- }
- }
- }
-
- return bResult;
+ if( eInFormat == PICTImageFileType)
+ return PICTtoPNG( rImgData, rPngData);
+
+ NSData* pData = [NSData dataWithBytesNoCopy: (void*)rImgData.getConstArray() length: rImgData.getLength() freeWhenDone: 0];
+ if( !pData)
+ return false;
+
+ NSBitmapImageRep* pRep =[NSBitmapImageRep imageRepWithData: pData];
+ if( !pRep)
+ return false;
+
+ NSData* pOut = [pRep representationUsingType: NSPNGFileType properties: nil];
+ if( !pOut)
+ return false;
+
+ const size_t nPngSize = [pOut length];
+ rPngData.realloc( nPngSize);
+ [pOut getBytes: rPngData.getArray() length: nPngSize];
+ return (nPngSize > 0);
}
-bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
- com::sun::star::uno::Sequence<sal_Int8>& aPict,
+bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+ com::sun::star::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat
)
{
- if( eOutFormat == PICTImageFileType )
- return BMPtoPICT( aBmp, aPict );
-
- bool bResult = false;
+ if( eOutFormat == PICTImageFileType)
+ return PNGtoPICT( rPngData, rImgData);
- NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(aBmp.getConstArray()) length: aBmp.getLength() freeWhenDone: 0];
- if( pData )
- {
+ NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(rPngData.getConstArray()) length: rPngData.getLength() freeWhenDone: 0];
+ if( !pData)
+ return false;
+
NSBitmapImageRep* pRep = [NSBitmapImageRep imageRepWithData: pData];
- if( pRep )
- {
- NSData* pOut = [pRep representationUsingType: eOutFormat properties: nil];
- if( pOut )
- {
- aPict.realloc( [pOut length] );
- [pOut getBytes: aPict.getArray() length: aPict.getLength()];
- bResult = (aPict.getLength() != 0);
- }
- }
- }
-
- return bResult;
+ if( !pRep)
+ return false;
+
+ NSData* pOut = [pRep representationUsingType: eOutFormat properties: nil];
+ if( !pOut)
+ return false;
+
+ const size_t nImgSize = [pOut length];
+ rImgData.realloc( nImgSize);
+ [pOut getBytes: rImgData.getArray() length: nImgSize];
+ return (nImgSize > 0);
}
+
Modified: openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx Sun Feb 3 13:23:59 2013
@@ -28,31 +28,31 @@
#include <Cocoa/Cocoa.h>
#include <postmac.h>
-/* Transform PICT into the a Window BMP.
+/** Transform an image from PICT to PNG format
Returns true if the conversion was successful false
otherwise.
*/
-bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
- com::sun::star::uno::Sequence<sal_Int8>& aBmp);
+bool PICTtoPNG(com::sun::star::uno::Sequence<sal_Int8>& rPictData,
+ com::sun::star::uno::Sequence<sal_Int8>& rPngData);
-/* Transform a Windows BMP to a PICT.
+/** Transform an image from PNG to a PICT format
Returns true if the conversion was successful false
otherwise.
*/
-bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
- com::sun::star::uno::Sequence<sal_Int8>& aPict);
+bool PNGtoPICT(com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+ com::sun::star::uno::Sequence<sal_Int8>& rPictData);
#define PICTImageFileType ((NSBitmapImageFileType)~0)
-bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
- com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+ com::sun::star::uno::Sequence<sal_Int8>& rPngData,
NSBitmapImageFileType eInFormat);
-bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
- com::sun::star::uno::Sequence<sal_Int8>& aPict,
- NSBitmapImageFileType eOutFormat
- );
+bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+ com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+ NSBitmapImageFileType eOutFormat);
#endif
+
Modified: openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdi.cxx Sun Feb 3 13:23:59 2013
@@ -1096,17 +1096,17 @@ sal_Bool AquaSalGraphics::drawPolyPolygo
// -----------------------------------------------------------------------
-void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGraphics )
+void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics *pSrcGraphics )
{
if( !pSrcGraphics )
pSrcGraphics = this;
//from unix salgdi2.cxx
//[FIXME] find a better way to prevent calc from crashing when width and height are negative
- if( pPosAry->mnSrcWidth <= 0
- || pPosAry->mnSrcHeight <= 0
- || pPosAry->mnDestWidth <= 0
- || pPosAry->mnDestHeight <= 0 )
+ if( rPosAry.mnSrcWidth <= 0
+ || rPosAry.mnSrcHeight <= 0
+ || rPosAry.mnDestWidth <= 0
+ || rPosAry.mnDestHeight <= 0 )
{
return;
}
@@ -1115,16 +1115,16 @@ void AquaSalGraphics::copyBits( const Sa
/*const*/ AquaSalGraphics* pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
const bool bSameGraphics = (this == pSrc) || (mbWindow && mpFrame && pSrc->mbWindow && (mpFrame == pSrc->mpFrame));
if( bSameGraphics
- && (pPosAry->mnSrcWidth == pPosAry->mnDestWidth)
- && (pPosAry->mnSrcHeight == pPosAry->mnDestHeight))
+ && (rPosAry.mnSrcWidth == rPosAry.mnDestWidth)
+ && (rPosAry.mnSrcHeight == rPosAry.mnDestHeight))
{
// short circuit if there is nothing to do
- if( (pPosAry->mnSrcX == pPosAry->mnDestX)
- && (pPosAry->mnSrcY == pPosAry->mnDestY))
+ if( (rPosAry.mnSrcX == rPosAry.mnDestX)
+ && (rPosAry.mnSrcY == rPosAry.mnDestY))
return;
// use copyArea() if source and destination context are identical
- copyArea( pPosAry->mnDestX, pPosAry->mnDestY, pPosAry->mnSrcX, pPosAry->mnSrcY,
- pPosAry->mnSrcWidth, pPosAry->mnSrcHeight, 0 );
+ copyArea( rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnSrcX, rPosAry.mnSrcY,
+ rPosAry.mnSrcWidth, rPosAry.mnSrcHeight, 0 );
return;
}
@@ -1133,8 +1133,8 @@ void AquaSalGraphics::copyBits( const Sa
DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from non-layered graphics" );
- const CGPoint aDstPoint = { +pPosAry->mnDestX - pPosAry->mnSrcX, pPosAry->mnDestY - pPosAry->mnSrcY };
- if( (pPosAry->mnSrcWidth == pPosAry->mnDestWidth && pPosAry->mnSrcHeight == pPosAry->mnDestHeight) &&
+ const CGPoint aDstPoint = { +rPosAry.mnDestX - rPosAry.mnSrcX, rPosAry.mnDestY - rPosAry.mnSrcY };
+ if( (rPosAry.mnSrcWidth == rPosAry.mnDestWidth && rPosAry.mnSrcHeight == rPosAry.mnDestHeight) &&
(!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // workaround a Quartz crasher
{
// in XOR mode the drawing context is redirected to the XOR mask
@@ -1145,7 +1145,7 @@ void AquaSalGraphics::copyBits( const Sa
xCopyContext = mpXorEmulation->GetTargetContext();
CGContextSaveGState( xCopyContext );
- const CGRect aDstRect = { {pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight} };
+ const CGRect aDstRect = { {rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight} };
CGContextClipToRect( xCopyContext, aDstRect );
// draw at new destination
@@ -1160,14 +1160,14 @@ void AquaSalGraphics::copyBits( const Sa
}
else
{
- SalBitmap* pBitmap = pSrc->getBitmap( pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight );
+ SalBitmap* pBitmap = pSrc->getBitmap( rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight );
if( pBitmap )
{
- SalTwoRect aPosAry( *pPosAry );
+ SalTwoRect aPosAry( rPosAry );
aPosAry.mnSrcX = 0;
aPosAry.mnSrcY = 0;
- drawBitmap( &aPosAry, *pBitmap );
+ drawBitmap( aPosAry, *pBitmap );
delete pBitmap;
}
}
@@ -1192,7 +1192,7 @@ void AquaSalGraphics::copyArea( long nDs
aPosAry.mnDestY = nDstY;
aPosAry.mnDestWidth = nSrcWidth;
aPosAry.mnDestHeight = nSrcHeight;
- drawBitmap( &aPosAry, *pBitmap );
+ drawBitmap( aPosAry, *pBitmap );
delete pBitmap;
}
#else
@@ -1239,17 +1239,17 @@ void AquaSalGraphics::copyArea( long nDs
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap )
+void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap )
{
if( !CheckContext() )
return;
const AquaSalBitmap& rBitmap = static_cast<const AquaSalBitmap&>(rSalBitmap);
- CGImageRef xImage = rBitmap.CreateCroppedImage( (int)pPosAry->mnSrcX, (int)pPosAry->mnSrcY, (int)pPosAry->mnSrcWidth, (int)pPosAry->mnSrcHeight );
+ CGImageRef xImage = rBitmap.CreateCroppedImage( (int)rPosAry.mnSrcX, (int)rPosAry.mnSrcY, (int)rPosAry.mnSrcWidth, (int)rPosAry.mnSrcHeight );
if( !xImage )
return;
- const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+ const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
CGContextDrawImage( mrContext, aDstRect, xImage );
CGImageRelease( xImage );
RefreshRect( aDstRect );
@@ -1257,26 +1257,26 @@ void AquaSalGraphics::drawBitmap( const
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor )
+void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,SalColor )
{
DBG_ERROR("not implemented for color masking!");
- drawBitmap( pPosAry, rSalBitmap );
+ drawBitmap( rPosAry, rSalBitmap );
}
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap )
+void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap )
{
if( !CheckContext() )
return;
const AquaSalBitmap& rBitmap = static_cast<const AquaSalBitmap&>(rSalBitmap);
const AquaSalBitmap& rMask = static_cast<const AquaSalBitmap&>(rTransparentBitmap);
- CGImageRef xMaskedImage( rBitmap.CreateWithMask( rMask, pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight ) );
+ CGImageRef xMaskedImage( rBitmap.CreateWithMask( rMask, rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight ) );
if( !xMaskedImage )
return;
- const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+ const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
CGImageRelease( xMaskedImage );
RefreshRect( aDstRect );
@@ -1284,17 +1284,17 @@ void AquaSalGraphics::drawBitmap( const
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawMask( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, SalColor nMaskColor )
+void AquaSalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, SalColor nMaskColor )
{
if( !CheckContext() )
return;
const AquaSalBitmap& rBitmap = static_cast<const AquaSalBitmap&>(rSalBitmap);
- CGImageRef xImage = rBitmap.CreateColorMask( pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight, nMaskColor );
+ CGImageRef xImage = rBitmap.CreateColorMask( rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight, nMaskColor );
if( !xImage )
return;
- const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+ const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
CGContextDrawImage( mrContext, aDstRect, xImage );
CGImageRelease( xImage );
RefreshRect( aDstRect );
@@ -1531,6 +1531,50 @@ bool AquaSalGraphics::drawAlphaBitmap( c
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+bool AquaSalGraphics::drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, const basegfx::B2DPoint& rY,
+ const SalBitmap& rSrcBitmap, const SalBitmap* pAlphaBmp )
+{
+ if( !CheckContext() )
+ return true;
+
+ // get the Quartz image
+ CGImageRef xImage = NULL;
+ const Size aSize = rSrcBitmap.GetSize();
+ const AquaSalBitmap& rSrcSalBmp = static_cast<const AquaSalBitmap&>(rSrcBitmap);
+ const AquaSalBitmap* pMaskSalBmp = static_cast<const AquaSalBitmap*>(pAlphaBmp);
+ if( !pMaskSalBmp)
+ xImage = rSrcSalBmp.CreateCroppedImage( 0, 0, (int)aSize.Width(), (int)aSize.Height() );
+ else
+ xImage = rSrcSalBmp.CreateWithMask( *pMaskSalBmp, 0, 0, (int)aSize.Width(), (int)aSize.Height() );
+ if( !xImage )
+ return false;
+
+ // setup the image transformation
+ // using the rNull,rX,rY points as destinations for the (0,0),(0,Width),(Height,0) source points
+ CGContextSaveGState( mrContext );
+ const basegfx::B2DVector aXRel = rX - rNull;
+ const basegfx::B2DVector aYRel = rY - rNull;
+ const CGAffineTransform aCGMat = CGAffineTransformMake(
+ aXRel.getX()/aSize.Width(), aXRel.getY()/aSize.Width(),
+ aYRel.getX()/aSize.Height(), aYRel.getY()/aSize.Height(),
+ rNull.getX(), rNull.getY());
+ CGContextConcatCTM( mrContext, aCGMat );
+
+ // draw the transformed image
+ const CGRect aSrcRect = {{0,0}, {aSize.Width(), aSize.Height()}};
+ CGContextDrawImage( mrContext, aSrcRect, xImage );
+ CGImageRelease( xImage );
+ // restore the Quartz graphics state
+ CGContextRestoreGState(mrContext);
+
+ // mark the destination as painted
+ const CGRect aDstRect = CGRectApplyAffineTransform( aSrcRect, aCGMat );
+ RefreshRect( aDstRect );
+ return true;
+}
+
+// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 nTransparency )
{
Modified: openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm (original)
+++ openoffice/branches/l10n/main/vcl/aqua/source/window/salframeview.mm Sun Feb 3 13:23:59 2013
@@ -37,6 +37,14 @@
#define WHEEL_EVENT_FACTOR 1.5
+// for allowing fullscreen support on deployment targets < OSX 10.7
+#if !defined(MAC_OS_X_VERSION_10_7)
+ #define NSWindowCollectionBehaviorFullScreenPrimary (1 << 7)
+ #define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8)
+// #define NSFullScreenWindowMask (1 << 14)
+#endif
+
+
static sal_uInt16 ImplGetModifierMask( unsigned int nMask )
{
sal_uInt16 nRet = 0;
@@ -153,6 +161,23 @@ static AquaSalFrame* getMouseContainerFr
pFrame->VCLToCocoa( aRect );
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
+
+ // enable OSX>=10.7 fullscreen options if available and useful
+ bool bAllowFullScreen = (0 == (mpFrame->mnStyle & (SAL_FRAME_STYLE_DIALOG | SAL_FRAME_STYLE_TOOLTIP | SAL_FRAME_STYLE_SYSTEMCHILD | SAL_FRAME_STYLE_FLOAT | SAL_FRAME_STYLE_TOOLWINDOW | SAL_FRAME_STYLE_INTRO)));
+ bAllowFullScreen &= (0 == (~mpFrame->mnStyle & (SAL_FRAME_STYLE_SIZEABLE)));
+ bAllowFullScreen &= (mpFrame->mpParent == NULL);
+ const SEL setCollectionBehavior = @selector(setCollectionBehavior:);
+ if( bAllowFullScreen && [pNSWindow respondsToSelector: setCollectionBehavior])
+ {
+ NSNumber* bMode = [NSNumber numberWithInt:(bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary)];
+ [pNSWindow performSelector:setCollectionBehavior withObject:bMode];
+ }
+
+ // disable OSX>=10.7 window restoration until we support it directly
+ const SEL setRestorable = @selector(setRestorable:);
+ if( [pNSWindow respondsToSelector: setRestorable])
+ [pNSWindow performSelector:setRestorable withObject:NO];
+
return pNSWindow;
}
@@ -324,6 +349,26 @@ static AquaSalFrame* getMouseContainerFr
return bRet;
}
+-(void)windowDidEnterFullScreen: (NSNotification*)pNotification
+{
+ YIELD_GUARD;
+
+ if( !mpFrame || !AquaSalFrame::isAlive( mpFrame))
+ return;
+ mpFrame->mbFullScreen = true;
+ (void)pNotification;
+}
+
+-(void)windowDidExitFullScreen: (NSNotification*)pNotification
+{
+ YIELD_GUARD;
+
+ if( !mpFrame || !AquaSalFrame::isAlive( mpFrame))
+ return;
+ mpFrame->mbFullScreen = false;
+ (void)pNotification;
+}
+
-(void)dockMenuItemTriggered: (id)sender
{
(void)sender;
Modified: openoffice/branches/l10n/main/vcl/inc/aqua/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/aqua/salgdi.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/aqua/salgdi.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/aqua/salgdi.h Sun Feb 3 13:23:59 2013
@@ -199,15 +199,15 @@ public:
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
- virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
- virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics );
+ virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap );
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap );
- virtual void drawMask( const SalTwoRect* pPosAry,
+ virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor );
@@ -223,6 +223,12 @@ public:
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap );
+ virtual bool drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap);
virtual bool drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 nTransparency );
Modified: openoffice/branches/l10n/main/vcl/inc/os2/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/os2/salgdi.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/os2/salgdi.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/os2/salgdi.h Sun Feb 3 13:23:59 2013
@@ -182,15 +182,15 @@ protected:
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
- virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
- virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics );
+ virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap );
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap );
- virtual void drawMask( const SalTwoRect* pPosAry,
+ virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor );
@@ -221,6 +221,12 @@ protected:
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap );
+ virtual bool drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap);
virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
public:
Modified: openoffice/branches/l10n/main/vcl/inc/salgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/salgdi.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/salgdi.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/salgdi.hxx Sun Feb 3 13:23:59 2013
@@ -97,8 +97,9 @@ class VCL_PLUGIN_PUBLIC SalGraphics
int m_nLayout; // 0: mirroring off, 1: mirror x-axis
protected:
+ /// bitfield
// flags which hold the SetAntialiasing() value from OutputDevice
- bool m_bAntiAliasB2DDraw;
+ bool m_bAntiAliasB2DDraw : 1;
public:
// get/set AA
@@ -135,15 +136,15 @@ protected:
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
- virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) = 0;
- virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) = 0;
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) = 0;
+ virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) = 0;
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor ) = 0;
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap ) = 0;
- virtual void drawMask( const SalTwoRect* pPosAry,
+ virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor ) = 0;
@@ -184,6 +185,15 @@ protected:
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap ) = 0;
+
+ /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the coordinate system */
+ virtual bool drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap) = 0;
+
/** Render solid rectangle with given transparency
@param nTransparency
@@ -401,23 +411,23 @@ public:
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
- void CopyBits( const SalTwoRect* pPosAry,
+ void CopyBits( const SalTwoRect& rPosAry,
SalGraphics* pSrcGraphics,
const OutputDevice *pOutDev,
const OutputDevice *pSrcOutDev );
- void DrawBitmap( const SalTwoRect* pPosAry,
+ void DrawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const OutputDevice *pOutDev );
- void DrawBitmap( const SalTwoRect* pPosAry,
+ void DrawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor,
const OutputDevice *pOutDev );
- void DrawBitmap( const SalTwoRect* pPosAry,
+ void DrawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap,
const OutputDevice *pOutDev );
- void DrawMask( const SalTwoRect* pPosAry,
+ void DrawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor,
const OutputDevice *pOutDev );
@@ -485,6 +495,14 @@ public:
const SalBitmap& rAlphaBitmap,
const OutputDevice *pOutDev );
+ bool DrawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap,
+ const OutputDevice* pOutDev );
+
bool DrawAlphaRect( long nX, long nY, long nWidth, long nHeight,
sal_uInt8 nTransparency, const OutputDevice *pOutDev );
Modified: openoffice/branches/l10n/main/vcl/inc/unx/gtk/gtkgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/gtk/gtkgdi.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/gtk/gtkgdi.hxx (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/gtk/gtkgdi.hxx Sun Feb 3 13:23:59 2013
@@ -81,7 +81,7 @@ public:
// a control is painted; but presentation effects need
// the background set to None; workaround: set the background
// before copyBits
- virtual void copyBits( const SalTwoRect* pPosAry,
+ virtual void copyBits( const SalTwoRect& rPosAry,
SalGraphics* pSrcGraphics );
protected:
Modified: openoffice/branches/l10n/main/vcl/inc/unx/pspgraphics.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/pspgraphics.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/pspgraphics.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/pspgraphics.h Sun Feb 3 13:23:59 2013
@@ -159,17 +159,17 @@ public:
long nSrcWidth,
long nSrcHeight,
sal_uInt16 nFlags );
- virtual void copyBits( const SalTwoRect* pPosAry,
+ virtual void copyBits( const SalTwoRect& rPosAry,
SalGraphics* pSrcGraphics );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap );
- virtual void drawMask( const SalTwoRect* pPosAry,
+ virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor );
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
@@ -183,6 +183,12 @@ public:
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap );
+ virtual bool drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap);
virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
virtual SystemGraphicsData GetGraphicsData() const;
Modified: openoffice/branches/l10n/main/vcl/inc/unx/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/salgdi.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/salgdi.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/salgdi.h Sun Feb 3 13:23:59 2013
@@ -175,7 +175,7 @@ protected:
int &nSrcY,
Pixmap hClipMask );
using SalGraphics::DrawBitmap;
- void DrawBitmap( const SalTwoRect *pPosAry,
+ void DrawBitmap( const SalTwoRect& rPosAry,
SalGraphics *pThis,
const SalBitmap &rSalBitmap,
const SalBitmap &rTransparentBitmap,
@@ -184,7 +184,7 @@ protected:
GC GetFontGC();
bool setFont( const ImplFontSelectData* pEntry, int nFallbackLevel );
- void drawMaskedBitmap( const SalTwoRect* pPosAry,
+ void drawMaskedBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap );
@@ -312,17 +312,17 @@ public:
long nSrcWidth,
long nSrcHeight,
sal_uInt16 nFlags );
- virtual void copyBits( const SalTwoRect* pPosAry,
+ virtual void copyBits( const SalTwoRect& rPosAry,
SalGraphics* pSrcGraphics );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor );
- virtual void drawBitmap( const SalTwoRect* pPosAry,
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rMaskBitmap );
- virtual void drawMask( const SalTwoRect* pPosAry,
+ virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor );
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
@@ -335,6 +335,12 @@ public:
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap );
+ virtual bool drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap);
virtual bool drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 nTransparency );
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define airbrush_curs_height 32
#define airbrush_curs_x_hot 5
#define airbrush_curs_y_hot 22
-static char airbrush_curs_bits[] = {
+static const unsigned char airbrush_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/airbrush_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define airbrush_mask_height 32
#define airbrush_mask_x_hot 5
#define airbrush_mask_y_hot 22
-static char airbrush_mask_bits[] = {
+static const unsigned char airbrush_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define ase_curs_height 32
#define ase_curs_x_hot 19
#define ase_curs_y_hot 16
-static char ase_curs_bits[] = {
+static const unsigned char ase_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/ase_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define ase_mask_height 32
#define ase_mask_x_hot 19
#define ase_mask_y_hot 16
-static char ase_mask_bits[] = {
+static const unsigned char ase_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define asn_curs_height 32
#define asn_curs_x_hot 16
#define asn_curs_y_hot 12
-static char asn_curs_bits[] = {
+static const unsigned char asn_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,
0x00,0x00,0xc0,0x07,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0x20,
0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asn_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define asn_mask_height 32
#define asn_mask_x_hot 16
#define asn_mask_y_hot 12
-static char asn_mask_bits[] = {
+static const unsigned char asn_mask_bits[] = {
0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,
0x00,0x00,0xe0,0x0f,0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x1f,0x00,0x00,0xf0,
0x1f,0x00,0x00,0x20,0x08,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_curs.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_curs.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_curs.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_curs.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define asne_curs_height 32
#define asne_curs_x_hot 21
#define asne_curs_y_hot 10
-static char asne_curs_bits[] = {
+static const unsigned char asne_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x80,
0x3f,0x00,0x00,0xc0,0x3f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x1c,0x00,0x00,
0x00,0x1c,0x00,0x00,0x70,0x18,0x00,0x00,0xf8,0x08,0x00,0x00,0xf8,0x00,0x00,
Modified: openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_mask.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_mask.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_mask.h (original)
+++ openoffice/branches/l10n/main/vcl/inc/unx/x11_cursors/asne_mask.h Sun Feb 3 13:23:59 2013
@@ -24,7 +24,7 @@
#define asne_mask_height 32
#define asne_mask_x_hot 21
#define asne_mask_y_hot 10
-static char asne_mask_bits[] = {
+static const unsigned char asne_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x80,0x7f,0x00,0x00,0xc0,
0x7f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xc0,0x7f,0x00,0x00,0x00,0x3f,0x00,0x00,
0x70,0x3e,0x00,0x00,0xf8,0x3c,0x00,0x00,0xfc,0x1d,0x00,0x00,0xfc,0x09,0x00,