You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/06/26 16:42:32 UTC
[openoffice] branch AOO42X updated: Revert "It is Portable Network Graphic, not Graphics"
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 58d7fd1eac Revert "It is Portable Network Graphic, not Graphics"
58d7fd1eac is described below
commit 58d7fd1eac7269ab7f21bd3da88bc4c8c98f7f99
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Jun 26 18:42:11 2023 +0200
Revert "It is Portable Network Graphic, not Graphics"
This reverts commit 21eb51a504da8dc735bfb770222efeb72c3997b8.
---
.../source/core/dataaccess/documentdefinition.cxx | 156 ++++++++++-----------
.../source/text/shared/00/00000005.xhp | 3 +-
.../source/text/shared/autopi/01110300.xhp | 17 ++-
.../EmbedDocument/Container1/EmbedContApp.java | 101 +++++++------
.../schema/org/openoffice/Office/Impress.xcs | 4 +-
main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 60 ++++----
6 files changed, 172 insertions(+), 169 deletions(-)
diff --git a/main/dbaccess/source/core/dataaccess/documentdefinition.cxx b/main/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 4584ba15f4..70ca6a306d 100644
--- a/main/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/main/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -282,13 +282,13 @@ namespace dbaccess
{
//.............................................................................
- typedef ::boost::optional< bool > optional_bool;
+ typedef ::boost::optional< bool > optional_bool;
//=========================================================================
//= helper
//=========================================================================
- namespace
- {
+ namespace
+ {
// --------------------------------------------------------------------
::rtl::OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage,
const ::rtl::OUString& _rEntityName )
@@ -306,8 +306,8 @@ namespace dbaccess
DBG_UNHANDLED_EXCEPTION();
}
return sContentType;
- }
- }
+ }
+ }
//==================================================================
// OEmbedObjectHolder
@@ -319,7 +319,7 @@ namespace dbaccess
Reference< XEmbeddedObject > m_xBroadCaster;
ODocumentDefinition* m_pDefinition;
bool m_bInStateChange;
- bool m_bInChangingState;
+ bool m_bInChangingState;
protected:
virtual void SAL_CALL disposing();
public:
@@ -328,13 +328,13 @@ namespace dbaccess
,m_xBroadCaster(_xBroadCaster)
,m_pDefinition(_pDefinition)
,m_bInStateChange(false)
- ,m_bInChangingState(false)
+ ,m_bInChangingState(false)
{
osl_incrementInterlockedCount( &m_refCount );
- {
- if ( m_xBroadCaster.is() )
- m_xBroadCaster->addStateChangeListener(this);
- }
+ {
+ if ( m_xBroadCaster.is() )
+ m_xBroadCaster->addStateChangeListener(this);
+ }
osl_decrementInterlockedCount( &m_refCount );
}
@@ -353,10 +353,10 @@ namespace dbaccess
//------------------------------------------------------------------
void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException)
{
- if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
+ if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
{
m_bInChangingState = true;
- //m_pDefinition->save(sal_False);
+ //m_pDefinition->save(sal_False);
m_bInChangingState = false;
}
}
@@ -401,7 +401,7 @@ namespace dbaccess
// XComponentSupplier
virtual Reference< util::XCloseable > SAL_CALL getComponent( ) throw (RuntimeException)
{
- return Reference< css::util::XCloseable >();
+ return Reference< css::util::XCloseable >();
}
// XEmbeddedClient
@@ -411,12 +411,12 @@ namespace dbaccess
inline void resetClient(ODocumentDefinition* _pClient) { m_pClient = _pClient; }
};
- //==================================================================
+ //==================================================================
// LockModifiable
//==================================================================
- class LockModifiable
- {
- public:
+ class LockModifiable
+ {
+ public:
LockModifiable( const Reference< XInterface >& i_rModifiable )
:m_xModifiable( i_rModifiable, UNO_QUERY )
{
@@ -482,20 +482,20 @@ namespace dbaccess
_rxActor->addEventListener( this );
}
osl_decrementInterlockedCount( &m_refCount );
- DBG_ASSERT( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" );
- }
+ DBG_ASSERT( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" );
+ }
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException);
- protected:
- };
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException);
+ protected:
+ };
- //------------------------------------------------------------------
- void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException)
- {
- m_xClient.clear();
- }
+ //------------------------------------------------------------------
+ void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException)
+ {
+ m_xClient.clear();
+ }
- //==================================================================
+ //==================================================================
// ODocumentSaveContinuation
//==================================================================
class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave >
@@ -1138,22 +1138,22 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons
return makeAny( xReportEngine->createDocumentAlive( NULL ) );
}
- if ( _bActivate && !bOpenHidden )
+ if ( _bActivate && !bOpenHidden )
{
- LockModifiable aLockModify( impl_getComponent_throw() );
+ LockModifiable aLockModify( impl_getComponent_throw() );
m_xEmbeddedObject->changeState( EmbedStates::ACTIVE );
- impl_onActivateEmbeddedObject_nothrow( false );
- }
- else
- {
- // ensure that we ourself are kept alive as long as the document is open
- LifetimeCoupler::couple( *this, xModel.get() );
+ impl_onActivateEmbeddedObject_nothrow( false );
}
+ else
+ {
+ // ensure that we ourself are kept alive as long as the document is open
+ LifetimeCoupler::couple( *this, xModel.get() );
+ }
if ( !m_bForm && m_pImpl->m_aProps.bAsTemplate && !m_bOpenInDesign )
- ODocumentDefinition::fillReportData( m_aContext, getComponent(), xConnection );
+ ODocumentDefinition::fillReportData( m_aContext, getComponent(), xConnection );
- return makeAny( xModel );
+ return makeAny( xModel );
}
// -----------------------------------------------------------------------------
@@ -1260,7 +1260,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
aIni[0] >>= sURL;
onCommandInsert( sURL, Environment );
}
- else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getdocumentinfo" ) ) // compatibility
+ else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getdocumentinfo" ) ) // compatibility
|| aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getDocumentInfo" ) )
)
{
@@ -1354,30 +1354,30 @@ namespace
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
- }
+ }
- }
+ }
}
// -----------------------------------------------------------------------------
void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const Reference< XCommandEnvironment >& Environment )
- throw( Exception )
+ throw( Exception )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
// Check, if all required properties were set.
if ( !_sURL.getLength() || m_xEmbeddedObject.is() )
{
- OSL_ENSURE( sal_False, "Content::onCommandInsert - property value missing!" );
+ OSL_ENSURE( sal_False, "Content::onCommandInsert - property value missing!" );
- Sequence< rtl::OUString > aProps( 1 );
- aProps[ 0 ] = PROPERTY_URL;
- ucbhelper::cancelCommandExecution(
+ Sequence< rtl::OUString > aProps( 1 );
+ aProps[ 0 ] = PROPERTY_URL;
+ ucbhelper::cancelCommandExecution(
makeAny( MissingPropertiesException(
rtl::OUString(),
static_cast< cppu::OWeakObject * >( this ),
aProps ) ),
Environment );
- // Unreachable
+ // Unreachable
}
@@ -1397,10 +1397,10 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R
,aMediaDesc
,aEmpty),UNO_QUERY);
- lcl_resetFormsToEmptyDataSource( m_xEmbeddedObject );
- // #i57669# / 2005-12-01 / frank.schoenheit@sun.com
+ lcl_resetFormsToEmptyDataSource( m_xEmbeddedObject );
+ // #i57669# / 2005-12-01 / frank.schoenheit@sun.com
- Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY);
+ Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY);
if ( xPersist.is() )
{
xPersist->storeOwn();
@@ -1415,11 +1415,11 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R
{
}
m_xEmbeddedObject = NULL;
- }
+ }
}
}
-// @@@
+// @@@
// storeData();
aGuard.clear();
@@ -1429,8 +1429,8 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R
sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
{
// default handling: instantiate an interaction handler and let it handle the parameter request
- if ( !m_bOpenInDesign )
- return sal_False;
+ if ( !m_bOpenInDesign )
+ return sal_False;
try
{
@@ -1476,26 +1476,26 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
pRequest->addContinuation(pAbort);
// create the handler, let it handle the request
- Reference< XInteractionHandler > xHandler( m_aContext.createComponent( (::rtl::OUString)SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY );
+ Reference< XInteractionHandler > xHandler( m_aContext.createComponent( (::rtl::OUString)SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY );
if ( xHandler.is() )
xHandler->handle(xRequest);
if ( pAbort->wasSelected() )
return sal_False;
- if ( pDisApprove->wasSelected() )
+ if ( pDisApprove->wasSelected() )
return sal_True;
if ( pDocuSave && pDocuSave->wasSelected() )
{
Reference<XNameContainer> xNC( pDocuSave->getContent(), UNO_QUERY_THROW );
- ::osl::ResettableMutexGuard aGuard( m_aMutex );
- NameChangeNotifier aNameChangeAndNotify( *this, pDocuSave->getName(), aGuard );
- m_pImpl->m_aProps.aTitle = pDocuSave->getName();
+ ::osl::ResettableMutexGuard aGuard( m_aMutex );
+ NameChangeNotifier aNameChangeAndNotify( *this, pDocuSave->getName(), aGuard );
+ m_pImpl->m_aProps.aTitle = pDocuSave->getName();
Reference< XContent> xContent = this;
xNC->insertByName(pDocuSave->getName(),makeAny(xContent));
- updateDocumentTitle();
+ updateDocumentTitle();
}
}
@@ -1517,8 +1517,8 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
sal_Bool ODocumentDefinition::saveAs()
{
// default handling: instantiate an interaction handler and let it handle the parameter request
- if ( !m_bOpenInDesign )
- return sal_False;
+ if ( !m_bOpenInDesign )
+ return sal_False;
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -1557,7 +1557,7 @@ sal_Bool ODocumentDefinition::saveAs()
if ( pAbort->wasSelected() )
return sal_False;
- if ( pDisApprove->wasSelected() )
+ if ( pDisApprove->wasSelected() )
return sal_True;
if ( pDocuSave->wasSelected() )
{
@@ -1877,7 +1877,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
m_xEmbeddedObject->setVisualAreaSize(Aspects::MSOLE_CONTENT,aSize);
}
}
- }
+ }
}
}
else
@@ -1937,13 +1937,13 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
DBG_UNHANDLED_EXCEPTION();
}
}
- }
+ }
// set the OfficeDatabaseDocument instance as parent of the embedded document
- // #i40358# / 2005-01-19 / frank.schoenheit@sun.com
- Reference< XChild > xDepdendDocAsChild( getComponent(), UNO_QUERY );
- if ( xDepdendDocAsChild.is() )
- {
+ // #i40358# / 2005-01-19 / frank.schoenheit@sun.com
+ Reference< XChild > xDepdendDocAsChild( getComponent(), UNO_QUERY );
+ if ( xDepdendDocAsChild.is() )
+ {
try
{
if ( !xDepdendDocAsChild->getParent().is() )
@@ -1964,7 +1964,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
// -----------------------------------------------------------------------------
void ODocumentDefinition::onCommandPreview(Any& _rImage)
{
- loadEmbeddedObjectForPreview();
+ loadEmbeddedObjectForPreview();
if ( m_xEmbeddedObject.is() )
{
try
@@ -1974,7 +1974,7 @@ void ODocumentDefinition::onCommandPreview(Any& _rImage)
{
DataFlavor aFlavor;
aFlavor.MimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png"));
- aFlavor.HumanPresentableName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Portable Network Graphic"));
+ aFlavor.HumanPresentableName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Portable Network Graphics"));
aFlavor.DataType = ::getCppuType(static_cast< const Sequence < sal_Int8 >* >(NULL));
_rImage = xTransfer->getTransferData( aFlavor );
@@ -2005,7 +2005,7 @@ void ODocumentDefinition::onCommandGetDocumentProperties( Any& _rProps )
}
catch( const Exception& )
{
- DBG_UNHANDLED_EXCEPTION();
+ DBG_UNHANDLED_EXCEPTION();
}
}
}
@@ -2325,7 +2325,7 @@ void ODocumentDefinition::updateDocumentTitle()
if ( xUntitledProvider.is() )
sName += ::rtl::OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) );
}
-
+
Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY);
if ( xDatabaseDocumentModel.is() )
sName = xDatabaseDocumentModel->getTitle() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")) + sName;
diff --git a/main/helpcontent2/source/text/shared/00/00000005.xhp b/main/helpcontent2/source/text/shared/00/00000005.xhp
index aab5c9659b..9c2919cf57 100644
--- a/main/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/main/helpcontent2/source/text/shared/00/00000005.xhp
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--***********************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -217,7 +218,7 @@
<section id="png">
<paragraph xml-lang="en-US" id="hd_id3155764" role="heading" level="2" l10n="U" oldref="91">PNG</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="92">Portable Network Graphic (PNG) is a graphic file format. The files are compressed with a selectable compression factor, and, as opposed to the JPG format, PNG files are always compressed without any information loss.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="92">Portable Network Graphics (PNG) is a graphic file format. The files are compressed with a selectable compression factor, and, as opposed to the JPG format, PNG files are always compressed without any information loss.</paragraph>
</section>
<section id="primaerschluessel">
diff --git a/main/helpcontent2/source/text/shared/autopi/01110300.xhp b/main/helpcontent2/source/text/shared/autopi/01110300.xhp
index 31c77b7ec4..28285dbc1b 100644
--- a/main/helpcontent2/source/text/shared/autopi/01110300.xhp
+++ b/main/helpcontent2/source/text/shared/autopi/01110300.xhp
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,21 +11,22 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-<helpdocument version="1.0">
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedautopi01110300xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">HTML Export - Page 3</title>
@@ -36,11 +39,11 @@
<paragraph role="paragraph" id="par_id3147102" xml-lang="en-US" l10n="U" oldref="28">Specifies the graphics type and the target screen resolution.</paragraph>
</section>
<section id="howtoget">
-<embed href="text/shared/00/00000401.xhp#htmlspeichern3"/>
+ <embed href="text/shared/00/00000401.xhp#htmlspeichern3"/>
</section>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="11">Save graphics as</paragraph>
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="12">Determines the image format. You can also define the compression value for the export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG" id="bm_id9604480" localize="false"/><paragraph role="heading" id="hd_id2298959" xml-lang="en-US" level="3" l10n="NEW">PNG - Portable Network Graphic format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG" id="bm_id9604480" localize="false"/><paragraph role="heading" id="hd_id2298959" xml-lang="en-US" level="3" l10n="NEW">PNG - Portable Network Graphics format</paragraph>
<paragraph role="paragraph" id="par_id4653767" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The files are exported as PNG files. PNG files are compressed without loss of data, and can contain more than 256 colors.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF" id="bm_id3153562" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="3" l10n="U" oldref="13">GIF - Graphics Interchange Format</paragraph>
<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SD:RADIOBUTTON:DLG_PUBLISHING:PAGE3_GIF">The files are exported as GIF files. GIF files are compressed without loss of data, and have a maximum of 256 colors.</ahelp></paragraph>
diff --git a/main/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/main/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
index 0412ceba43..bcba9b252c 100644
--- a/main/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
+++ b/main/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
import java.awt.*;
import java.applet.*;
import java.awt.event.*;
@@ -72,16 +70,16 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
private String m_aLinkURI;
public EmbedContApp( Frame aFrame, XMultiServiceFactory xServiceFactory )
- {
+ {
m_aFrame = aFrame;
m_xServiceFactory = xServiceFactory;
}
-
- public void init()
+
+ public void init()
{
resize( 640, 480 );
- setBackground( Color.gray );
-
+ setBackground( Color.gray );
+
m_aToolkit = Toolkit.getDefaultToolkit();
// Get a menu bar.
@@ -106,10 +104,10 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
aItem = new SaveMenuItem();
m_aFileMenu.add( aItem );
-
+
aItem = new SaveAsMenuItem();
m_aFileMenu.add( aItem );
-
+
// Object menu
m_aObjectMenu = new Menu( "Object", true );
aMenuBar.add( m_aObjectMenu );
@@ -126,7 +124,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
aItem = new ConvertLinkToEmbedMenuItem();
m_aObjectMenu.add( aItem );
- // Handle mouse clicks in our window.
+ // Handle mouse clicks in our window.
// addMouseListener( new MouseWatcher() );
addMouseListener( this );
}
@@ -135,11 +133,11 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
paint( g );
}
-
+
public void paint( Graphics g )
{
super.paint( g );
-
+
if ( m_xEmbedObj != null )
{
synchronized( this )
@@ -162,7 +160,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
m_xEmbedObj.changeState( EmbedStates.EMBED_RUNNING );
nState = EmbedStates.EMBED_RUNNING;
}
-
+
if ( nState == EmbedStates.EMBED_ACTIVE || nState == EmbedStates.EMBED_RUNNING )
{
XComponentSupplier xCompProv = (XComponentSupplier)UnoRuntime.queryInterface(
@@ -178,9 +176,9 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
DataFlavor aFlavor = new DataFlavor();
aFlavor.MimeType = "image/png";
- aFlavor.HumanPresentableName = "Portable Network Graphic";
+ aFlavor.HumanPresentableName = "Portable Network Graphics";
aFlavor.DataType = new Type( byte[].class );
-
+
byte[] aPNGData = (byte[])AnyConverter.toArray( xTransfer.getTransferData( aFlavor ) );
if ( aPNGData != null && aPNGData.length != 0 )
{
@@ -222,12 +220,12 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
}
}
}
-
+
public void mousePressed( MouseEvent e ){};
public void mouseEntered( MouseEvent e ){};
public void mouseExited( MouseEvent e ){};
public void mouseReleased( MouseEvent e ){};
-
+
// XEmbeddedClient
public void saveObject()
throws com.sun.star.uno.Exception
@@ -258,7 +256,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
// for now nothing to do
}
-
+
// classes
class NewMenuItem extends MenuItem implements ActionListener // Menu New
{
@@ -267,7 +265,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "New", new MenuShortcut( KeyEvent.VK_A ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// clear everything
@@ -284,7 +282,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "SaveAs..." );
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// open SaveAs dialog and store
@@ -331,7 +329,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "Open", new MenuShortcut( KeyEvent.VK_C ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// clear everything
@@ -348,7 +346,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
// create object from specified file
String aFileURI = aFile.toURI().toASCIIString();
-
+
// load from specified file
loadFileURI( aFileURI );
@@ -380,7 +378,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "Save", new MenuShortcut( KeyEvent.VK_D ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// if has persistence store there
@@ -392,7 +390,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
if ( m_xStorage == null )
{
JOptionPane.showMessageDialog( m_aFrame,
- "No storage for owned file!",
+ "No storage for oned file!",
"Error:",
JOptionPane.ERROR_MESSAGE );
return;
@@ -460,7 +458,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "Create", new MenuShortcut( KeyEvent.VK_N ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// remove current object an init a new one
@@ -475,8 +473,8 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
"com.sun.star.comp.Math.FormulaDocument" };
String selectedValue = (String)JOptionPane.showInputDialog( null, "DocumentType", "Select",
- JOptionPane.INFORMATION_MESSAGE, null,
- possibleValues, possibleValues[0] );
+ JOptionPane.INFORMATION_MESSAGE, null,
+ possibleValues, possibleValues[0] );
if ( selectedValue != null )
{
@@ -505,7 +503,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
}
}
}
-
+
generateNewImage();
repaint();
}
@@ -518,7 +516,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "Load from file", new MenuShortcut( KeyEvent.VK_L ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// first remove current object
@@ -568,7 +566,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "Create link", new MenuShortcut( KeyEvent.VK_M ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
// first remove current object
@@ -621,15 +619,15 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
super( "Convert link to embed", new MenuShortcut( KeyEvent.VK_M ));
addActionListener( this );
}
-
+
public void actionPerformed( ActionEvent e )
{
if ( !m_bLinkObj )
{
JOptionPane.showMessageDialog( m_aFrame, "The object is not a link!", "Error:", JOptionPane.ERROR_MESSAGE );
- return;
+ return;
}
-
+
if ( m_xEmbedObj != null )
{
if ( m_xStorage != null )
@@ -678,49 +676,49 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
int[] pTempClassID = { 0x8B, 0xC6, 0xB1, 0x65, 0xB1, 0xB2, 0x4E, 0xDD,
0xAA, 0x47, 0xDA, 0xE2, 0xEE, 0x68, 0x9D, 0xD6 };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
else if ( aServiceName.equals( "com.sun.star.comp.Writer.GlobalDocument" ) )
{
int[] pTempClassID = { 0xB2, 0x1A, 0x0A, 0x7C, 0xE4, 0x03, 0x41, 0xFE,
0x95, 0x62, 0xBD, 0x13, 0xEA, 0x6F, 0x15, 0xA0 };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
else if ( aServiceName.equals( "com.sun.star.comp.Writer.WebDocument" ) )
{
int[] pTempClassID = { 0xA8, 0xBB, 0xA6, 0x0C, 0x7C, 0x60, 0x45, 0x50,
0x91, 0xCE, 0x39, 0xC3, 0x90, 0x3F, 0xAC, 0x5E };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
else if ( aServiceName.equals( "com.sun.star.comp.Calc.SpreadsheetDocument" ) )
{
int[] pTempClassID = { 0x47, 0xBB, 0xB4, 0xCB, 0xCE, 0x4C, 0x4E, 0x80,
0xA5, 0x91, 0x42, 0xD9, 0xAE, 0x74, 0x95, 0x0F };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
else if ( aServiceName.equals( "com.sun.star.comp.Draw.PresentationDocument" ) )
{
int[] pTempClassID = { 0x91, 0x76, 0xE4, 0x8A, 0x63, 0x7A, 0x4D, 0x1F,
0x80, 0x3B, 0x99, 0xD9, 0xBF, 0xAC, 0x10, 0x47 };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
else if ( aServiceName.equals( "com.sun.star.comp.Draw.DrawingDocument" ) )
{
int[] pTempClassID = { 0x4B, 0xAB, 0x89, 0x70, 0x8A, 0x3B, 0x45, 0xB3,
0x99, 0x1C, 0xCB, 0xEE, 0xAC, 0x6B, 0xD5, 0xE3 };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
else if ( aServiceName.equals( "com.sun.star.comp.Math.FormulaDocument" ) )
{
int[] pTempClassID = { 0x07, 0x8B, 0x7A, 0xBA, 0x54, 0xFC, 0x45, 0x7F,
0x85, 0x51, 0x61, 0x47, 0xE7, 0x76, 0xA9, 0x97 };
for ( int ind = 0; ind < 16; ind++ )
- pClassID[ind] = (byte)pTempClassID[ind];
+ pClassID[ind] = (byte)pTempClassID[ind];
}
if ( pClassID != null )
@@ -881,7 +879,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
JOptionPane.showMessageDialog( m_aFrame, e, "Exception in createTempStorage():", JOptionPane.ERROR_MESSAGE );
}
-
+
return xTempStorage;
}
@@ -901,7 +899,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
m_xStorage.copyToStorage( xTargetStorage );
-
+
XComponent xComponent = (XComponent)UnoRuntime.queryInterface( XComponent.class, m_xStorage );
xComponent.dispose();
@@ -918,7 +916,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
JOptionPane.showMessageDialog( m_aFrame, e, "Exception in saveStorageToFileURI():", JOptionPane.ERROR_MESSAGE );
}
-
+
}
public void loadFileURI( String aFileURI )
@@ -1006,15 +1004,15 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
if ( xLinkOutStream != null && xTruncate != null )
{
xTruncate.truncate();
-
+
char[] aLinkChar = m_aLinkURI.toCharArray();
byte[] aLinkBytes = new byte[ aLinkChar.length ];
for ( int ind = 0; ind < aLinkChar.length; ind++ )
aLinkBytes[ind] = (byte)aLinkChar[ind];
-
+
xLinkOutStream.writeBytes( aLinkBytes );
xLinkOutStream.closeOutput();
-
+
XComponent xComponent = (XComponent) UnoRuntime.queryInterface( XComponent.class,
xLinkStream );
if ( xComponent != null )
@@ -1039,8 +1037,9 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
e,
"Exception in storeLinkToStorage:",
JOptionPane.ERROR_MESSAGE );
-
+
}
}
}
}
+
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 2159456f60..6204a278ff 100644
--- a/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -145,7 +145,7 @@
</prop>
<prop oor:name="OLEOptimizationType" oor:type="xs:short">
<info>
- <desc>Specifies the compression type that is being used.</desc>
+ <desc>Specifies the compression type that is being used,.</desc>
</info>
<constraints>
<enumeration oor:value="0">
@@ -1396,7 +1396,7 @@
<desc>MS Windows bitmap</desc>
</info>
</enumeration>
- <enumeration oor:value="PNG - Portable Network Graphic">
+ <enumeration oor:value="PNG - Portable Network Graphics">
<info>
<desc>Portable Network Graphic</desc>
</info>
diff --git a/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 0419f3dacc..d5e2b6f371 100644
--- a/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -53,7 +53,7 @@ namespace // private
const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0);
const Type CPPUTYPE_OUSTRING = getCppuType( (OUString*)0 );
- /* Determine whether or not a DataFlavor is valid.
+ /* Determine whether or not a DataFlavor is valid.
*/
bool isValidFlavor(const DataFlavor& aFlavor)
{
@@ -107,7 +107,7 @@ namespace // private
const char* FLAVOR_GDIMF = "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
const char* FLAVOR_WMF = "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
const char* FLAVOR_EMF = "application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-
+
const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal";
@@ -119,16 +119,16 @@ namespace // private
Type DataType;
};
- /* At the moment it appears as if only MS Office pastes "public.html" to the clipboard.
+ /* At the moment it appears as if only MS Office pastes "public.html" to the clipboard.
*/
static const FlavorMap flavorMap[] =
{
{ NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", CPPUTYPE_OUSTRING },
{ NSRTFPboardType, "text/richtext", "Rich Text Format", CPPUTYPE_SEQINT8 },
- { NSTIFFPboardType, "image/png", "Portable Network Graphic", CPPUTYPE_SEQINT8 },
- { NSPICTPboardType, "image/png", "Portable Network Graphic", 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 },
+ { NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", CPPUTYPE_SEQINT8 },
{ PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", CPPUTYPE_SEQINT8 },
{ PBTYPE_SLSDX, FLAVOR_SLSDX, "Star Link Source Descriptor (XML)", CPPUTYPE_SEQINT8 },
{ PBTYPE_ESX, FLAVOR_ESX, "Star Embed Source (XML)", CPPUTYPE_SEQINT8 },
@@ -161,7 +161,7 @@ namespace // private
//###########################
-/* A base class for other data provider.
+/* A base class for other data provider.
*/
class DataProviderBaseImpl : public DataProvider
{
@@ -182,7 +182,7 @@ DataProviderBaseImpl::DataProviderBaseImpl(const Any& data) :
{
}
-DataProviderBaseImpl::DataProviderBaseImpl(id data) :
+DataProviderBaseImpl::DataProviderBaseImpl(id data) :
mSystemData(data)
{
[mSystemData retain];
@@ -203,7 +203,7 @@ class UniDataProvider : public DataProviderBaseImpl
{
public:
UniDataProvider(const Any& data);
-
+
UniDataProvider(NSData* data);
virtual NSData* getSystemData();
@@ -238,8 +238,8 @@ Any UniDataProvider::getOOoData()
if (mSystemData)
{
- oOOData = makeAny(OUString(reinterpret_cast<const sal_Char*>([mSystemData bytes]),
- [mSystemData length],
+ oOOData = makeAny(OUString(reinterpret_cast<const sal_Char*>([mSystemData bytes]),
+ [mSystemData length],
RTL_TEXTENCODING_UTF8));
}
else
@@ -299,7 +299,7 @@ Any ByteSequenceDataProvider::getOOoData()
{
oOOData = mData;
}
-
+
return oOOData;
}
@@ -358,14 +358,14 @@ Any HTMLFormatDataProvider::getOOoData()
plainHtml = HTMLFormatToTextHtml(unkHtmlData);
pPlainHtml = &plainHtml;
}
-
+
oOOData = makeAny(*pPlainHtml);
}
else
{
oOOData = mData;
}
-
+
return oOOData;
}
@@ -411,7 +411,7 @@ NSData* PNGDataProvider::getSystemData()
/* 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
+ so we convert 'PCT' to a PNG and provide this to AOO
*/
Any PNGDataProvider::getOOoData()
{
@@ -431,7 +431,7 @@ Any PNGDataProvider::getOOoData()
{
oOOData = mData;
}
-
+
return oOOData;
}
@@ -480,7 +480,7 @@ Any FileListDataProvider::getOOoData()
Sequence<sal_Int8> oOOFileList(lenSeqRequired);
unichar* pBuffer = reinterpret_cast<unichar*>(oOOFileList.getArray());
rtl_zeroMemory(pBuffer, lenSeqRequired);
-
+
for (size_t i = 0; i < length; i++)
{
NSString* fname = [mSystemData objectAtIndex: i];
@@ -495,7 +495,7 @@ Any FileListDataProvider::getOOoData()
{
oOOData = mData;
}
-
+
return oOOData;
}
@@ -518,7 +518,7 @@ DataFlavorMapper::~DataFlavorMapper()
{
[it->second release];
it->second = nil;
- }
+ }
}
DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const
@@ -545,7 +545,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat
oOOFlavor.HumanPresentableName = rtl::OUString();
oOOFlavor.DataType = CPPUTYPE_SEQINT8;
}
-
+
return oOOFlavor;
}
@@ -554,7 +554,7 @@ const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor& oO
const NSString* sysFlavor = NULL;
rbInternal = false;
rbInternal = false;
-
+
for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
{
if (oOOFlavor.MimeType.compareToAscii(flavorMap[i].OOoFlavor, strlen(flavorMap[i].OOoFlavor)) == 0)
@@ -593,7 +593,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* systemFlavo
DataFlavor oOOFlavor = systemToOpenOfficeFlavor(systemFlavor);
Any data = rTransferable->getTransferData(oOOFlavor);
-
+
if (isByteSequenceType(data.getValueType()))
{
/*
@@ -601,7 +601,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* systemFlavo
this is useful for exchange with MS Word (which brings this stuff from Windows)
but annoying for other applications. Since this extension is not a standard datatype
on the Mac, let us not provide but provide normal HTML
-
+
if ([systemFlavor caseInsensitiveCompare: NSHTMLPboardType] == NSOrderedSame)
{
dp = DataProviderPtr_t(new HTMLFormatDataProvider(data));
@@ -711,7 +711,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: 1];
bool bNeedDummyInternalFlavor(false);
-
+
for (sal_uInt32 i = 0; i < nFlavors; i++)
{
if( flavors[i].MimeType.compareToAscii( "image/bmp", 9 ) == 0 )
@@ -722,7 +722,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
else
{
const NSString* str = openOfficeToSystemFlavor(flavors[i], bNeedDummyInternalFlavor);
-
+
if (str != NULL)
{
[str retain];
@@ -733,7 +733,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
// #i89462# #i90747#
// in case no system flavor was found to report
- // report at least one so D&D between AOO targets works
+ // report at least one so D&D between OOo targets works
if( [array count] == 0 || bNeedDummyInternalFlavor)
{
[array addObject: PBTYPE_DUMMY_INTERNAL];