[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
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 a3f67fb4d2 Fixed typos, removed whitespace
a3f67fb4d2 is described below
commit a3f67fb4d220fe5bca57e7af54239899b2ff8f8b
Author: mseidel
AuthorDate: Wed Sep 13 00:22:46 2023 +0200
Fixed typos, removed whitespace
(cherry picked from commit 0f46dff71a3a0e0942a743e8b5b7c556cf7fbc70)
---
main/UnoControls/source/controls/framecontrol.cxx | 51 ---
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/main/UnoControls/source/controls/framecontrol.cxx
b/main/UnoControls/source/controls/framecontrol.cxx
index 4afbfa5d06..24ecdcac9f 100644
--- a/main/UnoControls/source/controls/framecontrol.cxx
+++ b/main/UnoControls/source/controls/framecontrol.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,21 +7,20 @@
* 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.
- *
+ *
*/
-
//__
// my own include
//__
@@ -89,13 +88,13 @@ Any SAL_CALL FrameControl::queryInterface( const Type&
rType ) throw( RuntimeExc
Reference< XInterface > xDel = BaseControl::impl_getDelegator();
if ( xDel.is() )
{
- // If an delegator exist, forward question to his
queryInterface.
+ // If a delegator exists, forward question to his
queryInterface.
// Delegator will ask his own queryAggregation!
aReturn = xDel->queryInterface( rType );
}
else
{
- // If an delegator unknown, forward question to own
queryAggregation.
+ // If a delegator unknown, forward question to own
queryAggregation.
aReturn = queryAggregation( rType );
}
@@ -149,8 +148,8 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw(
RuntimeException )
{
// Create a static typecollection ...
static OTypeCollection aTypeCollection (
::getCppuType(( const Reference< XControlModel >*)NULL
) ,
-
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
-
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
BaseControl::getTypes()
);
// ... and set his address to static pointer!
@@ -170,8 +169,8 @@ Any SAL_CALL FrameControl::queryAggregation( const Type&
aType ) throw( RuntimeE
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by
OComponentHelper!
Any aReturn ( ::cppu::queryInterface( aType
,
-
static_cast< XControlModel* > ( this )
,
-
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0f46dff71a Fixed typos, removed whitespace
0f46dff71a is described below
commit 0f46dff71a3a0e0942a743e8b5b7c556cf7fbc70
Author: mseidel
AuthorDate: Wed Sep 13 00:22:46 2023 +0200
Fixed typos, removed whitespace
---
main/UnoControls/source/controls/framecontrol.cxx | 51 ---
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/main/UnoControls/source/controls/framecontrol.cxx
b/main/UnoControls/source/controls/framecontrol.cxx
index 4afbfa5d06..24ecdcac9f 100644
--- a/main/UnoControls/source/controls/framecontrol.cxx
+++ b/main/UnoControls/source/controls/framecontrol.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,21 +7,20 @@
* 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.
- *
+ *
*/
-
//__
// my own include
//__
@@ -89,13 +88,13 @@ Any SAL_CALL FrameControl::queryInterface( const Type&
rType ) throw( RuntimeExc
Reference< XInterface > xDel = BaseControl::impl_getDelegator();
if ( xDel.is() )
{
- // If an delegator exist, forward question to his
queryInterface.
+ // If a delegator exists, forward question to his
queryInterface.
// Delegator will ask his own queryAggregation!
aReturn = xDel->queryInterface( rType );
}
else
{
- // If an delegator unknown, forward question to own
queryAggregation.
+ // If a delegator unknown, forward question to own
queryAggregation.
aReturn = queryAggregation( rType );
}
@@ -149,8 +148,8 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw(
RuntimeException )
{
// Create a static typecollection ...
static OTypeCollection aTypeCollection (
::getCppuType(( const Reference< XControlModel >*)NULL
) ,
-
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
-
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
BaseControl::getTypes()
);
// ... and set his address to static pointer!
@@ -170,8 +169,8 @@ Any SAL_CALL FrameControl::queryAggregation( const Type&
aType ) throw( RuntimeE
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by
OComponentHelper!
Any aReturn ( ::cppu::queryInterface( aType
,
-
static_cast< XControlModel* > ( this )
,
-
static_cast< XConnectionPointContainer* > (
[openoffice] branch AOO41X updated: Removing hsqldb from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new efedb85fa1 Removing hsqldb from ext_source since we bootstrap it later efedb85fa1 is described below commit efedb85fa165fce2f1cf1cabad4d626e2b4ab7bf Author: mseidel AuthorDate: Tue Sep 12 17:21:59 2023 +0200 Removing hsqldb from ext_source since we bootstrap it later (cherry picked from commit d98be9a24613ebe504de87f0f919d2f1a41bc1d6) --- .../17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip | Bin 3519470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip deleted file mode 100644 index 8f932dcdba..00 Binary files a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip and /dev/null differ
[openoffice] branch AOO42X updated: Removing hsqldb from ext_source since we bootstrap it later
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 65413f9714 Removing hsqldb from ext_source since we bootstrap it later 65413f9714 is described below commit 65413f971454d98eb120fac8f0c653995d145586 Author: mseidel AuthorDate: Tue Sep 12 17:21:59 2023 +0200 Removing hsqldb from ext_source since we bootstrap it later (cherry picked from commit d98be9a24613ebe504de87f0f919d2f1a41bc1d6) --- .../17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip | Bin 3519470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip deleted file mode 100644 index 8f932dcdba..00 Binary files a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip and /dev/null differ
[openoffice] branch trunk updated: Removing hsqldb from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new d98be9a246 Removing hsqldb from ext_source since we bootstrap it later d98be9a246 is described below commit d98be9a24613ebe504de87f0f919d2f1a41bc1d6 Author: mseidel AuthorDate: Tue Sep 12 17:21:59 2023 +0200 Removing hsqldb from ext_source since we bootstrap it later --- .../17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip | Bin 3519470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip deleted file mode 100644 index 8f932dcdba..00 Binary files a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip and /dev/null differ
