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 2022/01/15 13:23:18 UTC
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace, removed multiple license headers
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 cc57ba3 Fixed typos, removed whitespace, removed multiple license headers
cc57ba3 is described below
commit cc57ba345c81f429cf0b8b3d7e8fb7802efa85ef
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Jan 15 14:20:05 2022 +0100
Fixed typos, removed whitespace, removed multiple license headers
(cherry picked from commit 916729d09a13a81b9710827c57afa2a17578286c)
---
main/basegfx/source/workbench/Makefile | 48 ++-------------
main/scp2/source/templates/module_langpack.sct | 8 +--
.../scp2/source/templates/module_langpack_base.sct | 8 +--
.../source/templates/module_langpack_binfilter.sct | 29 ++-------
.../scp2/source/templates/module_langpack_calc.sct | 29 ++-------
.../scp2/source/templates/module_langpack_draw.sct | 8 +--
.../source/templates/module_langpack_impress.sct | 8 +--
.../scp2/source/templates/module_langpack_math.sct | 8 +--
.../templates/module_langpack_onlineupdate.sct | 29 ++-------
.../scp2/source/templates/module_langpack_root.sct | 8 +--
.../source/templates/module_langpack_writer.sct | 29 ++-------
.../controller/SlsInsertionIndicatorHandler.hxx | 10 +--
.../slidesorter/inc/controller/SlsPageSelector.hxx | 14 ++---
.../slidesorter/inc/controller/SlsProperties.hxx | 17 +++--
.../inc/controller/SlsScrollBarManager.hxx | 16 ++---
.../inc/controller/SlsSelectionFunction.hxx | 34 +++++-----
.../inc/controller/SlsSelectionManager.hxx | 10 +--
.../inc/controller/SlsSelectionObserver.hxx | 8 +--
.../inc/controller/SlsSlideFunction.hxx | 8 +--
.../slidesorter/inc/controller/SlsSlotManager.hxx | 14 ++---
.../inc/controller/SlsTransferableData.hxx | 16 ++---
.../inc/controller/SlsVisibleAreaManager.hxx | 12 ++--
main/xmerge/source/activesync/XMergeFilter.h | 72 ++--------------------
.../source/fvt/uno/sc/rowcolumn/CellMerge.java | 46 +++++++-------
.../source/fvt/uno/sc/sheet/SheetBasicTest.java | 28 +++++----
25 files changed, 171 insertions(+), 346 deletions(-)
diff --git a/main/basegfx/source/workbench/Makefile b/main/basegfx/source/workbench/Makefile
index 34f1edb..68b55e3 100644
--- a/main/basegfx/source/workbench/Makefile
+++ b/main/basegfx/source/workbench/Makefile
@@ -1,6 +1,6 @@
# Testbuild
# *************************************************************
-#
+#
# 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
@@ -8,56 +8,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.
-#
-# *************************************************************
-# *************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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.
-#
-# *************************************************************
-# *************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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.
-#
+#
# *************************************************************
#test : bezierclip.cxx convexhull.cxx
diff --git a/main/scp2/source/templates/module_langpack.sct b/main/scp2/source/templates/module_langpack.sct
index a4920ee..81b8e6e 100644
--- a/main/scp2/source/templates/module_langpack.sct
+++ b/main/scp2/source/templates/module_langpack.sct
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/templates/module_langpack_base.sct b/main/scp2/source/templates/module_langpack_base.sct
index 461bead..3335dce 100644
--- a/main/scp2/source/templates/module_langpack_base.sct
+++ b/main/scp2/source/templates/module_langpack_base.sct
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/templates/module_langpack_binfilter.sct b/main/scp2/source/templates/module_langpack_binfilter.sct
index 1e604a2..0fb664b 100644
--- a/main/scp2/source/templates/module_langpack_binfilter.sct
+++ b/main/scp2/source/templates/module_langpack_binfilter.sct
@@ -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,38 +7,19 @@
* 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.
- *
+ *
*************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
- *************************************************************/
+
Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
diff --git a/main/scp2/source/templates/module_langpack_calc.sct b/main/scp2/source/templates/module_langpack_calc.sct
index c974cfa..816997e 100644
--- a/main/scp2/source/templates/module_langpack_calc.sct
+++ b/main/scp2/source/templates/module_langpack_calc.sct
@@ -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,38 +7,19 @@
* 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.
- *
+ *
*************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
- *************************************************************/
+
Module gid_Module_Langpack_Calc_<LANGUAGE_>
ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
diff --git a/main/scp2/source/templates/module_langpack_draw.sct b/main/scp2/source/templates/module_langpack_draw.sct
index 47bb271..4026ac2 100644
--- a/main/scp2/source/templates/module_langpack_draw.sct
+++ b/main/scp2/source/templates/module_langpack_draw.sct
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/templates/module_langpack_impress.sct b/main/scp2/source/templates/module_langpack_impress.sct
index d17a233..756efdd 100644
--- a/main/scp2/source/templates/module_langpack_impress.sct
+++ b/main/scp2/source/templates/module_langpack_impress.sct
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/templates/module_langpack_math.sct b/main/scp2/source/templates/module_langpack_math.sct
index 4ece703..90d1d85 100644
--- a/main/scp2/source/templates/module_langpack_math.sct
+++ b/main/scp2/source/templates/module_langpack_math.sct
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/templates/module_langpack_onlineupdate.sct b/main/scp2/source/templates/module_langpack_onlineupdate.sct
index 75ea8b8..ffc1362 100644
--- a/main/scp2/source/templates/module_langpack_onlineupdate.sct
+++ b/main/scp2/source/templates/module_langpack_onlineupdate.sct
@@ -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,38 +7,19 @@
* 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.
- *
+ *
*************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
- *************************************************************/
+
Module gid_Module_Langpack_Onlineupdate_<LANGUAGE_>
ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
diff --git a/main/scp2/source/templates/module_langpack_root.sct b/main/scp2/source/templates/module_langpack_root.sct
index 6349c91..57d72cd 100644
--- a/main/scp2/source/templates/module_langpack_root.sct
+++ b/main/scp2/source/templates/module_langpack_root.sct
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/templates/module_langpack_writer.sct b/main/scp2/source/templates/module_langpack_writer.sct
index d91e986..005d82b 100644
--- a/main/scp2/source/templates/module_langpack_writer.sct
+++ b/main/scp2/source/templates/module_langpack_writer.sct
@@ -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,38 +7,19 @@
* 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.
- *
+ *
*************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
- *************************************************************/
+
Module gid_Module_Langpack_Writer_<LANGUAGE_>
ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
index 5df8537..e777dbf 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -77,7 +77,7 @@ public:
private:
const ::boost::shared_ptr<InsertionIndicatorHandler> mpHandler;
};
-
+
/** Update the indicator icon from the current transferable (from the
clipboard or an active drag and drop operation.)
*/
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 4cf378a..243cf1e 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -75,7 +75,7 @@ public:
void GetCoreSelection (void);
/** Update the selection state of the SdPage objects to be the same as
- that of the correspinding page descriptors.
+ that of the corresponding page descriptors.
*/
void SetCoreSelection (void);
@@ -93,10 +93,10 @@ public:
void SelectPage (const model::SharedPageDescriptor& rpDescriptor);
/** Return whether the specified page is selected. This convenience
- method is a subsitute for
+ method is a substitute for
SlideSorterModel::GetPageDescriptor(i)->IsSelected() is included
here to make this class more self contained.
- */
+ */
bool IsPageSelected (int nPageIndex);
/** Deselect the descriptor that is associated with the given page.
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index d2f45c5..83c84f2 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -54,7 +54,7 @@ public:
bool IsShowSelection (void) const;
void SetShowSelection (const bool bIsShowSelection);
- /** When this method returns <TRUE/> then the focusdselection is indicated in
+ /** When this method returns <TRUE/> then the focusdeselection is indicated in
the view (typically by drawing dotted rectangles around the selected
slides.) The default value is <TRUE/>.
*/
@@ -69,7 +69,7 @@ public:
bool IsCenterSelection (void) const;
void SetCenterSelection (const bool bIsCenterSelection);
- /** When this mehod returns <TRUE/> then the view may try to change the
+ /** When this method returns <TRUE/> then the view may try to change the
visible area by scrolling it smoothly on the screen. Experimental.
Default value is <FALSE/>.
*/
@@ -103,7 +103,7 @@ public:
Color GetHighlightColor (void) const;
void SetHighlightColor (const Color& rColor);
- /** The UI can be set to be read only indepently from the model status.
+ /** The UI can be set to be read only independently from the model status.
Used for instance in the presenter view.
*/
bool IsUIReadOnly (void) const;
@@ -115,7 +115,7 @@ public:
*/
bool IsOnlyPreviewTriggersMouseOver (void) const;
void SetOnlyPreviewTriggersMouseOver (const bool bFlag);
-
+
bool IsHighContrastModeActive (void) const;
private:
@@ -137,4 +137,3 @@ private:
} } } // end of namespace ::sd::slidesorter::controller
#endif
-
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 5aefd16..388700f 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -51,7 +51,7 @@ namespace sd { namespace slidesorter { namespace controller {
/** Manage the horizontal and vertical scroll bars. Listen for events, set
their sizes, place them in the window, determine their visibilities.
-
+
<p>Handle auto scrolling, i.e. the scrolling of the window when the
mouse comes near the window border while dragging a selection.</p>
@@ -86,12 +86,12 @@ public:
*/
void Connect (void);
- /** Remove listeners from the scroll bars. This method is called whent
+ /** Remove listeners from the scroll bars. This method is called when
the slide sorter is destroyed or when it is suspended, e.g. put
into a cache for later reuse.
*/
void Disconnect (void);
-
+
/** Set up the scroll bar, i.e. thumb size and position. Call this
method when the content of the browser window changed, i.e. pages
were inserted or deleted, the layout or the zoom factor has
@@ -193,7 +193,7 @@ private:
objects of this class. It is given to the constructor.
*/
::boost::shared_ptr<ScrollBar> mpHorizontalScrollBar;
-
+
/** The vertical scroll bar. Note that is used but not owned by
objects of this class. It is given to the constructor.
*/
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index db39fcb..427330f 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -48,7 +48,7 @@ class SlideSorterController;
class DragAndDropContext;
-class SelectionFunction
+class SelectionFunction
: public FuPoor,
private ::boost::noncopyable
{
@@ -56,37 +56,37 @@ public:
TYPEINFO();
static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest );
-
+
// Mouse- & Key-Events
virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
-
+
virtual void Activate();
virtual void Deactivate();
-
+
virtual void ScrollStart();
virtual void ScrollEnd();
- /// Forward to the clipboard manager.
+ // Forward to the clipboard manager.
virtual void DoCut (void);
- /// Forward to the clipboard manager.
+ // Forward to the clipboard manager.
virtual void DoCopy (void);
- /// Forward to the clipboard manager.
+ // Forward to the clipboard manager.
virtual void DoPaste (void);
/** is called when the current function should be aborted. <p>
This is used when a function gets a KEY_ESCAPE but can also
be called directly.
- @returns
+ @returns
true if a active function was aborted
*/
virtual bool cancel();
-
+
void MouseDragged (
const AcceptDropEvent& rEvent,
const sal_Int8 nDragAction);
@@ -122,7 +122,7 @@ public:
being interpreted as drag-and-drop start.
*/
void ResetMouseAnchor (void);
-
+
protected:
SlideSorter& mrSlideSorter;
SlideSorterController& mrController;
@@ -135,13 +135,13 @@ protected:
private:
- /// The rectangle of the mouse drag selection.
+ // The rectangle of the mouse drag selection.
Rectangle maDragSelectionRectangle;
bool mbDragSelection;
- /// Box of the insert marker in model coordinates.
+ // Box of the insert marker in model coordinates.
Rectangle maInsertionMarkerBox;
-
+
/** We use this flag to filter out the cases where MouseMotion() is called
with a pressed mouse button but without a prior MouseButtonDown()
call. This is an indication that the mouse button was pressed over
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 2a3e8cf..22ce587 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -56,7 +56,7 @@ public:
/** Create a new SelectionManger for the given slide sorter.
*/
SelectionManager (SlideSorter& rSlideSorter);
-
+
~SelectionManager (void);
/** Delete the currently selected slides. When this method returns the
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 5487bf1..79c2c7f 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
index b5d6f28..b44f90a 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
@@ -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.
- *
+ *
*************************************************************/
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index 51b6971..f0689eb 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -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,19 +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.
- *
+ *
*************************************************************/
+
#ifndef SD_SLIDESORTER_SLOT_MANAGER_HXX
#define SD_SLIDESORTER_SLOT_MANAGER_HXX
@@ -45,7 +46,7 @@ class Command;
/** This manager takes over the work of handling slot calls from the
controller of the slide sorter.
*/
-class SlotManager
+class SlotManager
{
public:
/** Create a new slot manager that handles slot calls for the controller
@@ -111,11 +112,10 @@ private:
This can be the current selection or the insertion indicator.
*/
sal_Int32 GetInsertionPosition (void);
-
+
DECL_LINK(UserEventCallback, void*);
};
} } } // end of namespace ::sd::slidesorter::controller
#endif
-
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index 7c46add..b8a89bd 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -42,7 +42,7 @@ class TransferableData
: public SdTransferable::UserData,
public SfxListener
{
-public:
+public:
class Representative
{
public:
@@ -60,14 +60,14 @@ public:
};
static SdTransferable* CreateTransferable (
- SdDrawDocument* pSrcDoc,
- ::sd::View* pWorkView,
+ SdDrawDocument* pSrcDoc,
+ ::sd::View* pWorkView,
sal_Bool bInitOnGetData,
SlideSorterViewShell* pViewShell,
const ::std::vector<TransferableData::Representative>& rRepresentatives);
static ::boost::shared_ptr<TransferableData> GetFromTransferable (const SdTransferable* pTransferable);
-
+
TransferableData (
SlideSorterViewShell* pViewShell,
const ::std::vector<TransferableData::Representative>& rRepresentatives);
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/main/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
index 2f01d7b..52d9154 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
@@ -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.
- *
+ *
*************************************************************/
@@ -77,7 +77,7 @@ private:
Cleared on every call to ForgetVisibleRequests() and MakeVisible().
*/
::std::vector<Rectangle> maVisibleRequests;
-
+
/** Animation id for a scroll animation that sets the top
and left of the visible area to maRequestedVisibleTopLeft.
*/
@@ -85,7 +85,7 @@ private:
Point maRequestedVisibleTopLeft;
Animator::AnimationMode meRequestedAnimationMode;
bool mbIsCurrentSlideTrackingActive;
- int mnDisableCount;
+ int mnDisableCount;
void MakeVisible (void);
::boost::optional<Point> GetRequestedTopLeft (void) const;
diff --git a/main/xmerge/source/activesync/XMergeFilter.h b/main/xmerge/source/activesync/XMergeFilter.h
index d9090a9..4b100c6 100644
--- a/main/xmerge/source/activesync/XMergeFilter.h
+++ b/main/xmerge/source/activesync/XMergeFilter.h
@@ -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,76 +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.
- *
- *************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
- *************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
- *************************************************************/
-/**************************************************************
- *
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- *
+ *
*************************************************************/
// XMergeFilter.h: interface for the CXMergeFilter class.
//
@@ -144,8 +84,8 @@ public:
STDMETHODIMP FilterOptions(HWND hwndParent);
STDMETHODIMP FormatMessage(DWORD dwFlags, DWORD dwMessageId, DWORD dwLanguageId,
LPTSTR lpBuffer, DWORD nSize, va_list *Arguments, DWORD *pcb);
- STDMETHODIMP NextConvertFile(int nConversion, CFF_CONVERTINFO *pci,
- CFF_SOURCEFILE *psf, CFF_DESTINATIONFILE *pdf,
+ STDMETHODIMP NextConvertFile(int nConversion, CFF_CONVERTINFO *pci,
+ CFF_SOURCEFILE *psf, CFF_DESTINATIONFILE *pdf,
volatile BOOL *pbCancel, CF_ERROR *perr);
};
diff --git a/test/testuno/source/fvt/uno/sc/rowcolumn/CellMerge.java b/test/testuno/source/fvt/uno/sc/rowcolumn/CellMerge.java
index c580bd5..b45c506 100644
--- a/test/testuno/source/fvt/uno/sc/rowcolumn/CellMerge.java
+++ b/test/testuno/source/fvt/uno/sc/rowcolumn/CellMerge.java
@@ -1,23 +1,24 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
+/**************************************************************
+ *
+ * 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
* regarding copyright ownership. The ASF licenses this file
* 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.
- *
+ *
*************************************************************/
-
package fvt.uno.sc.rowcolumn;
import static org.junit.Assert.*;
@@ -80,30 +81,29 @@ public class CellMerge {
scComponent = unoApp.newDocument("scalc");
scDocument = (XSpreadsheetDocument) UnoRuntime.queryInterface(XSpreadsheetDocument.class, scComponent);
XSpreadsheets spreadsheets = scDocument.getSheets();
- Object sheetObj = spreadsheets.getByName(sheetname);
+ Object sheetObj = spreadsheets.getByName(sheetname);
XSpreadsheet sheet = (XSpreadsheet) UnoRuntime.queryInterface(XSpreadsheet.class, sheetObj);
- //Select A1 and input "12"
+ // Select A1 and input "12"
XCell cell = sheet.getCellByPosition(0, 0);
cell.setValue(12);
// Get cell range A1:B1 by position - (column, row, column, row)
- XCellRange CellRange = sheet.getCellRangeByPosition( 0, 0, 1, 0 );
- //XCellRange CellRange = sheet.getCellRangeByName("A1:B1");
-
- //Merge cell range A1:B1 into one cell
- XMergeable xMerge = (XMergeable) UnoRuntime.queryInterface(XMergeable.class, CellRange);
- xMerge.merge(true);
-
- //Verify if the cell range A1:B1 is completely merged
- assertEquals("Verify if the cell range A1:B1 is completely merged",true, xMerge.getIsMerged());
-
- //Undo Merge cell range A1:B1 into one cell
- xMerge.merge(false);
-
- //Verify if the cell range A1:B1 is no longer merged
- assertEquals("Verify if the cell range A1:B1 is no longer merged",false, xMerge.getIsMerged());
-
+ XCellRange CellRange = sheet.getCellRangeByPosition( 0, 0, 1, 0 );
+ //XCellRange CellRange = sheet.getCellRangeByName("A1:B1");
+
+ // Merge cell range A1:B1 into one cell
+ XMergeable xMerge = (XMergeable) UnoRuntime.queryInterface(XMergeable.class, CellRange);
+ xMerge.merge(true);
+
+ // Verify if the cell range A1:B1 is completely merged
+ assertEquals("Verify if the cell range A1:B1 is completely merged",true, xMerge.getIsMerged());
+
+ // Undo Merge cell range A1:B1 into one cell
+ xMerge.merge(false);
+
+ // Verify if the cell range A1:B1 is no longer merged
+ assertEquals("Verify if the cell range A1:B1 is no longer merged",false, xMerge.getIsMerged());
}
diff --git a/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java b/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
index 7563f13..3ac4c7a 100644
--- a/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
+++ b/test/testuno/source/fvt/uno/sc/sheet/SheetBasicTest.java
@@ -1,20 +1,22 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
+/**************************************************************
+ *
+ * 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
* regarding copyright ownership. The ASF licenses this file
* 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.
- *
+ *
*************************************************************/
package fvt.uno.sc.sheet;
@@ -86,7 +88,7 @@ public class SheetBasicTest {
(short) 1);
SCUtil.setCurrentSheet(scDocument, newSpreadSheet);
- // get the new speadsheet name
+ // get the new spreadsheet name
assertEquals("actual should equals aa", sheetname,
SCUtil.getSCSheetNameByIndex(scDocument, (short) 1));
@@ -115,7 +117,7 @@ public class SheetBasicTest {
}
/**
- * Test copy and past sheet
+ * Test copy and paste sheet
*/
@Test
public void copypastesheet() throws Exception {
@@ -295,7 +297,7 @@ public class SheetBasicTest {
int firstSheetcolorid = (Integer) sheet1PropertySet
.getPropertyValue("TabColor");
- // Get the copyed sheet color
+ // Get the copied sheet color
XPropertySet newsheetPropertySet = (XPropertySet) UnoRuntime
.queryInterface(XPropertySet.class,
SCUtil.getSCSheetByIndex(scDocument, (short) 3));
@@ -416,11 +418,11 @@ public class SheetBasicTest {
assertEquals("Expect formula result should be blank", "",
SCUtil.getTextFromCell(thirdexternalsheet, 1, 2));
- //save and close document
+ // save and close document
SCUtil.save(scDocument);
SCUtil.closeFile(scDocument);
- //Open souce document and change the value in souce document
+ // Open source document and change the value in source document
XSpreadsheetDocument sourcescDocument = SCUtil.reloadFile(unoApp,
scDocument, "source.xls");
firstSheet = SCUtil.getSCSheetByIndex(sourcescDocument, (short) 0);
@@ -432,7 +434,7 @@ public class SheetBasicTest {
SCUtil.save(sourcescDocument);
SCUtil.closeFile(sourcescDocument);
- //Open link document
+ // Open link document
tempscDocument = SCUtil.reloadFile(unoApp, scDocument, "linked.ods");
scDocument = tempscDocument;
spreadsheets = scDocument.getSheets();
@@ -441,7 +443,7 @@ public class SheetBasicTest {
secondexternalsheet = SCUtil.getSCSheetByIndex(scDocument, (short) 4);
thirdexternalsheet = SCUtil.getSCSheetByIndex(scDocument, (short) 5);
- //get Object SheetLinks for document
+ // get Object SheetLinks for document
XPropertySet sheetpropertyset = (XPropertySet) UnoRuntime
.queryInterface(XPropertySet.class, scDocument);
Object sheetLinks = sheetpropertyset.getPropertyValue("SheetLinks");
@@ -449,7 +451,7 @@ public class SheetBasicTest {
XIndexAccess xsheetlinks = (XIndexAccess) UnoRuntime.queryInterface(
XIndexAccess.class, sheetLinks);
- //Refresh all links
+ // Refresh all links
for (int i = 0; i < xsheetlinks.getCount(); i++) {
Object sheetlink = xsheetlinks.getByIndex(i);
XRefreshable xsheetRefreshable = (XRefreshable) UnoRuntime
@@ -475,7 +477,7 @@ public class SheetBasicTest {
assertEquals("Expect formula result should be blank", "",
SCUtil.getTextFromCell(thirdexternalsheet, 1, 2));
- //Save the document before close
+ // Save the document before close
SCUtil.save(scDocument);
}