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 00bcbf8545 Fixed typo (menues -> menus), removed whitespace
00bcbf8545 is described below
commit 00bcbf854555d5f60e005656f389575320ceed61
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Oct 5 17:36:06 2023 +0200
Fixed typo (menues -> menus), removed whitespace
(cherry picked from commit fcab2ba6d17f2df720f3fcb8f956a8e234c4d5b7)
---
main/dbaccess/source/ui/inc/dbu_resource.hrc | 101 ++++----
main/embeddedobj/source/general/docholder.cxx | 130 +++++------
main/svtools/source/contnr/svimpbox.cxx | 317 +++++++++++++-------------
3 files changed, 275 insertions(+), 273 deletions(-)
diff --git a/main/dbaccess/source/ui/inc/dbu_resource.hrc
b/main/dbaccess/source/ui/inc/dbu_resource.hrc
index 6277f10b87..ea83f23f8c 100644
--- a/main/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/main/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -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.
- *
+ *
*************************************************************/
@@ -41,7 +41,7 @@
#define RID_UNTYPED_START RID_DBACCESS_START
#define RID_WARN_START RID_DBACCESS_START
#define RID_CONTROL_START RID_DBACCESS_START
-#define RID_MISC_START RID_DBACCESS_START
+#define RID_MISC_START RID_DBACCESS_START
// new defines to make the strings folder specific
#define RID_STR_BRW_START RID_DBACCESS_START
@@ -111,10 +111,10 @@
#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28
-#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29
-#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30
-#define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31
-#define DLG_TABLE_FILTER RID_DIALOG_START + 32
+#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29
+#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30
+#define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31
+#define DLG_TABLE_FILTER RID_DIALOG_START + 32
//========================================================================
// tab pages
@@ -139,35 +139,35 @@
#define PAGE_USERDRIVER RID_PAGE_START
+ 19
#define PAGE_MYSQL_JDBC RID_PAGE_START
+ 20
#define PAGE_GENERATED_VALUES RID_PAGE_START + 22
-#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23
-#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24
- // FREE
- // FREE
+#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23
+#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24
+// FREE
+// FREE
#define PAGE_ORACLE_JDBC RID_PAGE_START + 27
#define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28
- // FREE
- // FREE
- // FREE
+// FREE
+// FREE
+// FREE
#define PAGE_MOZILLA RID_PAGE_START + 32
#define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33
-#define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40
-#define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41
-#define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42
-#define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43
-#define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44
-#define PAGE_DBWIZARD_ADABAS RID_PAGE_START + 45
-#define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46
-#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47
-#define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48
-#define PAGE_DBWIZARD_JDBC RID_PAGE_START + 49
-#define PAGE_DBWIZARD_ADO RID_PAGE_START + 50
-#define PAGE_DBWIZARD_ODBC RID_PAGE_START + 51
-#define PAGE_DBWIZARD_SPREADSHEET RID_PAGE_START + 52
-#define PAGE_DBWIZARD_AUTHENTIFICATION RID_PAGE_START + 53
-#define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START + 54
-#define PAGE_DBWIZARD_FINAL RID_PAGE_START + 55
+#define PAGE_DBWIZARD_INTRO
RID_PAGE_START + 40
+#define PAGE_DBWIZARD_DBASE
RID_PAGE_START + 41
+#define PAGE_DBWIZARD_TEXT
RID_PAGE_START + 42
+#define PAGE_DBWIZARD_MSACCESS RID_PAGE_START
+ 43
+#define PAGE_DBWIZARD_LDAP
RID_PAGE_START + 44
+#define PAGE_DBWIZARD_ADABAS RID_PAGE_START
+ 45
+#define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START
+ 46
+#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START
+ 47
+#define PAGE_DBWIZARD_ORACLE RID_PAGE_START
+ 48
+#define PAGE_DBWIZARD_JDBC
RID_PAGE_START + 49
+#define PAGE_DBWIZARD_ADO
RID_PAGE_START + 50
+#define PAGE_DBWIZARD_ODBC
RID_PAGE_START + 51
+#define PAGE_DBWIZARD_SPREADSHEET RID_PAGE_START
+ 52
+#define PAGE_DBWIZARD_AUTHENTIFICATION RID_PAGE_START + 53
+#define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START
+ 54
+#define PAGE_DBWIZARD_FINAL
RID_PAGE_START + 55
#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START
+ 56
#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START
+ 57
@@ -179,7 +179,7 @@
#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4
- // FREE
+// FREE
#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6
// FREE
#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
@@ -202,7 +202,7 @@
#define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7
#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8
#define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9
- // FREE
+// FREE
#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11
#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12
#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13
@@ -240,23 +240,23 @@
#define BMP_EXCEPTION_INFO RID_IMAGE_START + 5
#define QUERYFOLDER_TREE_ICON RID_IMAGE_START + 6
#define QUERY_TREE_ICON RID_IMAGE_START
+ 7
-#define DATABASE_TREE_ICON RID_IMAGE_START + 8
+#define DATABASE_TREE_ICON RID_IMAGE_START
+ 8
// free
// free
// free
#define IMG_PKEYICON RID_IMAGE_START
+ 12
-#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13
-#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14
+#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13
+#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14
#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15
#define QUERYFOLDER_TREE_ICON_SCH RID_IMAGE_START + 16
#define TABLEFOLDER_TREE_ICON_SCH RID_IMAGE_START + 17
// free
-#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19
+#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19
#define IMG_DATABASE_CONNECTED_SCH RID_IMAGE_START + 20
#define TABLE_TREE_ICON_SCH RID_IMAGE_START + 21
#define VIEW_TREE_ICON_SCH RID_IMAGE_START + 22
#define QUERY_TREE_ICON_SCH RID_IMAGE_START + 23
-#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24
+#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24
// free
// free
// free
@@ -287,7 +287,7 @@
#define REPORT_TREE_ICON RID_IMAGE_START
+ 52
#define FORM_TREE_ICON_SCH RID_IMAGE_START
+ 53
#define REPORT_TREE_ICON_SCH RID_IMAGE_START + 54
-#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55
+#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55
//========================================================================
@@ -307,7 +307,7 @@
#define IMP_REPORT_LCH RID_IMAGELIST_START + 12
//========================================================================
-// menues
+// menus
#define MENU_TABLETREE_POPUP RID_MENU_START + 0
#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1
@@ -334,14 +334,14 @@
// controls
#define RID_DB_TAB_EDITOR RID_CONTROL_START + 0
-#define RID_MYSQL_NATIVE_SETTINGS RID_CONTROL_START + 1
+#define RID_MYSQL_NATIVE_SETTINGS RID_CONTROL_START + 1
//========================================================================
// strings
#define STR_TBL_TITLE
RID_STR_GEN_START
-#define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1
+#define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1
#define RID_STR_CONNECTION_LOST
RID_STR_GEN_START + 2
-#define STR_NAME_ALREADY_EXISTS RID_STR_GEN_START + 3
+#define STR_NAME_ALREADY_EXISTS
RID_STR_GEN_START + 3
// free
#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5
#define STR_STAT_WARNING
RID_STR_GEN_START + 6
@@ -362,8 +362,8 @@
#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21
#define STR_QRY_TITLE
RID_STR_GEN_START + 22
#define STR_VIEW_TITLE
RID_STR_GEN_START + 23
-#define STR_SUB_DOCS_WITH_SCRIPTS RID_STR_GEN_START + 24
-#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL RID_STR_GEN_START + 25
+#define STR_SUB_DOCS_WITH_SCRIPTS RID_STR_GEN_START + 24
+#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL RID_STR_GEN_START + 25
#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26
#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27
#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28
@@ -377,9 +377,9 @@
#define STR_FOLDER_LABEL
RID_STR_GEN_START + 36
#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37
#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38
- // FREE
-#define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40
-#define RID_STR_EXTENSION_NAME RID_STR_GEN_START + 41
+// FREE
+#define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40
+#define RID_STR_EXTENSION_NAME RID_STR_GEN_START + 41
//========================================================================
// untyped resources
@@ -387,7 +387,7 @@
// free
#define RSC_CHARSETS RID_UNTYPED_START + 2
// free
-#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4
+#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4
#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5
#define IMG_TABLESUBCRIPTION_SCH RID_UNTYPED_START + 6
#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7
@@ -413,4 +413,3 @@
#define FL_INVOLVED_FIELDS RID_MISC_START + 6
#endif // _DBU_RESOURCE_HRC_
-
diff --git a/main/embeddedobj/source/general/docholder.cxx
b/main/embeddedobj/source/general/docholder.cxx
index c9e7275771..9ff93f5b58 100644
--- a/main/embeddedobj/source/general/docholder.cxx
+++ b/main/embeddedobj/source/general/docholder.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.
- *
+ *
*************************************************************/
@@ -181,14 +181,14 @@ DocumentHolder::DocumentHolder( const uno::Reference<
lang::XMultiServiceFactory
aArg.Value <<= sal_True;
m_aOutplaceFrameProps[0] <<= aArg;
- aArg.Name = ::rtl::OUString::createFromAscii("MakeVisible");
- aArg.Value <<= sal_False;
- m_aOutplaceFrameProps[1] <<= aArg;
+ aArg.Name = ::rtl::OUString::createFromAscii("MakeVisible");
+ aArg.Value <<= sal_False;
+ m_aOutplaceFrameProps[1] <<= aArg;
const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM (
"com.sun.star.frame.Desktop" ) );
uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance(
aServiceName ), uno::UNO_QUERY );
if ( xDesktop.is() )
- {
+ {
m_refCount++;
try
{
@@ -202,7 +202,7 @@ DocumentHolder::DocumentHolder( const uno::Reference<
lang::XMultiServiceFactory
aArg.Name = ::rtl::OUString::createFromAscii("ParentFrame");
aArg.Value <<= xDesktop; //TODO/LATER: should use parent
document frame
m_aOutplaceFrameProps[2] <<= aArg;
- }
+ }
else
m_aOutplaceFrameProps.realloc( 2 );
}
@@ -215,7 +215,7 @@ DocumentHolder::~DocumentHolder()
if( m_xFrame.is() )
CloseFrame();
- if ( m_xComponent.is() )
+ if ( m_xComponent.is() )
{
try {
CloseDocument( sal_True, sal_False );
@@ -228,8 +228,8 @@ DocumentHolder::~DocumentHolder()
m_pInterceptor->release();
}
- if ( !m_bDesktopTerminated )
- FreeOffice();
+ if ( !m_bDesktopTerminated )
+ FreeOffice();
}
//---------------------------------------------------------------------------
@@ -269,7 +269,7 @@ void DocumentHolder::FreeOffice()
uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance(
aServiceName ), uno::UNO_QUERY );
if ( xDesktop.is() )
{
- xDesktop->removeTerminateListener( this );
+ xDesktop->removeTerminateListener( this );
// the following code is commented out since for now there is
still no completely correct way to detect
// whether the office can be terminated, so it is better to
have unnecessary process running than
@@ -295,10 +295,10 @@ void DocumentHolder::FreeOffice()
//---------------------------------------------------------------------------
void DocumentHolder::CloseDocument( sal_Bool bDeliverOwnership, sal_Bool
bWaitForClose )
{
- uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent,
uno::UNO_QUERY );
+ uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent,
uno::UNO_QUERY );
if ( xBroadcaster.is() )
{
- uno::Reference< document::XEventBroadcaster > xEventBroadcaster(
m_xComponent, uno::UNO_QUERY );
+ uno::Reference< document::XEventBroadcaster >
xEventBroadcaster( m_xComponent, uno::UNO_QUERY );
if ( xEventBroadcaster.is() )
xEventBroadcaster->removeEventListener( (
document::XEventListener* )this );
else
@@ -319,7 +319,7 @@ void DocumentHolder::CloseDocument( sal_Bool
bDeliverOwnership, sal_Bool bWaitFo
}
}
- m_xComponent = 0;
+ m_xComponent = 0;
}
//---------------------------------------------------------------------------
@@ -329,7 +329,7 @@ void DocumentHolder::PlaceFrame( const awt::Rectangle&
aNewRect )
"The object does not have windows required for inplace mode!"
);
//TODO: may need mutex locking???
- if ( m_xFrame.is() && m_xOwnWindow.is() )
+ if ( m_xFrame.is() && m_xOwnWindow.is() )
{
// the frame can be replaced only in inplace mode
frame::BorderWidths aOldWidths;
@@ -388,7 +388,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const
uno::Reference< frame::XFra
try
{
- uno::Reference< ::com::sun::star::frame::XLayoutManager >
xLayoutManager;
+ uno::Reference< ::com::sun::star::frame::XLayoutManager >
xLayoutManager;
uno::Reference< beans::XPropertySet > xPropSet( xFrame,
uno::UNO_QUERY_THROW );
xPropSet->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
if ( xLayoutManager.is() )
@@ -420,7 +420,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference<
awt::XWindowPeer >&
if ( !m_xFrame.is() )
{
- uno::Reference < frame::XModel > xModel( GetComponent(),
uno::UNO_QUERY );
+ uno::Reference < frame::XModel > xModel( GetComponent(),
uno::UNO_QUERY );
awt::Rectangle aHatchRectangle = AddBorderToArea(
aRectangleToShow );
awt::Rectangle aOwnRectangle( HATCH_BORDER_WIDTH,
@@ -430,8 +430,8 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference<
awt::XWindowPeer >&
uno::Reference< awt::XWindow > xHWindow;
uno::Reference< awt::XWindowPeer > xMyParent( xParent );
- if ( xModel.is() )
- {
+ if ( xModel.is() )
+ {
uno::Reference< embed::XHatchWindowFactory >
xHatchFactory(
m_xFactory->createInstance(
@@ -447,20 +447,20 @@ sal_Bool DocumentHolder::ShowInplace( const
uno::Reference< awt::XWindowPeer >&
awt::Size(
HATCH_BORDER_WIDTH, HATCH_BORDER_WIDTH ) );
uno::Reference< awt::XWindowPeer > xHatchWinPeer(
xHatchWindow, uno::UNO_QUERY );
- xHWindow = uno::Reference< awt::XWindow >( xHatchWinPeer,
uno::UNO_QUERY );
+ xHWindow = uno::Reference< awt::XWindow >(
xHatchWinPeer, uno::UNO_QUERY );
if ( !xHWindow.is() )
throw uno::RuntimeException(); // TODO: can not
create own window
- xHatchWindow->setController( uno::Reference<
embed::XHatchWindowController >(
+ xHatchWindow->setController( uno::Reference<
embed::XHatchWindowController >(
static_cast< embed::XHatchWindowController* >( this ) ) );
- xMyParent = xHatchWinPeer;
+ xMyParent = xHatchWinPeer;
}
- else
- {
+ else
+ {
aOwnRectangle.X += aHatchRectangle.X;
aOwnRectangle.Y += aHatchRectangle.Y;
- }
+ }
awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP,
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("dockingwindow") ),
@@ -481,7 +481,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference<
awt::XWindowPeer >&
throw uno::RuntimeException(); // TODO: can not create
own window
// create a frame based on the specified window
- uno::Reference< lang::XSingleServiceFactory > xFrameFact(
+ uno::Reference< lang::XSingleServiceFactory > xFrameFact(
m_xFactory->createInstance(
::rtl::OUString::createFromAscii( "com.sun.star.frame.TaskCreator" ) ),
uno::UNO_QUERY_THROW );
@@ -523,7 +523,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference<
awt::XWindowPeer >&
// TODO: some listeners to the frame and the window ( resize
for example )
}
- if ( m_xComponent.is() )
+ if ( m_xComponent.is() )
{
if ( !LoadDocToFrame( sal_True ) )
{
@@ -752,11 +752,11 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference<
::com::sun::star::frame::
// as long as the LM is invisible and locked an empty tool
space will be used on resizing
xOwnLM->setDockingAreaAcceptor( xDocAreaAcc );
- // try to merge menues; don't do anything else if it fails
+ // try to merge menus; don't do anything else if it fails
if ( MergeMenues_Impl( xOwnLM, xContainerLM,
xContainerDP, aContModuleName ) )
{
// make sure that the container LM does not control the
size of the containers window anymore
- // this must be done after merging menues as we won't get
the container menu otherwise
+ // this must be done after merging menus as we won't get
the container menu otherwise
xContainerLM->setDockingAreaAcceptor( uno::Reference <
ui::XDockingAreaAcceptor >() );
// prevent further changes at this LM
@@ -776,7 +776,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference<
::com::sun::star::frame::
bResult = sal_True;
// TODO/LATER: The following action should be done only if
the window is not hidden
- // otherwise the activation must fail, unfortunatelly
currently it is not possible
+ // otherwise the activation must fail, unfortunately
currently it is not possible
// to detect whether the window is hidden using UNO API
m_xOwnWindow->setFocus();
}
@@ -964,9 +964,9 @@ uno::Reference< frame::XFrame >
DocumentHolder::GetDocFrame()
}
}
catch ( uno::Exception& )
- {
+ {
}
-
+
return m_xFrame;
}
@@ -982,19 +982,19 @@ void DocumentHolder::SetComponent( const uno::Reference<
util::XCloseable >& xDo
{}
}
- m_xComponent = xDoc;
- // done outside currently uno::Reference < container::XChild > xChild(
m_xComponent, uno::UNO_QUERY );
- // done outside currently if ( xChild.is() && m_pEmbedObj )
- // done outside currently xChild->setParent( m_pEmbedObj->getParent() );
+ m_xComponent = xDoc;
+ // done outside currently uno::Reference < container::XChild > xChild(
m_xComponent, uno::UNO_QUERY );
+ // done outside currently if ( xChild.is() && m_pEmbedObj )
+ // done outside currently xChild->setParent(
m_pEmbedObj->getParent() );
m_bReadOnly = bReadOnly;
- m_bAllowClosing = sal_False;
+ m_bAllowClosing = sal_False;
- uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent,
uno::UNO_QUERY );
+ uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent,
uno::UNO_QUERY );
if ( xBroadcaster.is() )
xBroadcaster->addCloseListener( ( util::XCloseListener* )this );
- uno::Reference< document::XEventBroadcaster > xEventBroadcaster(
m_xComponent, uno::UNO_QUERY );
+ uno::Reference< document::XEventBroadcaster > xEventBroadcaster(
m_xComponent, uno::UNO_QUERY );
if ( xEventBroadcaster.is() )
xEventBroadcaster->addEventListener( (
document::XEventListener* )this );
else
@@ -1007,13 +1007,13 @@ void DocumentHolder::SetComponent( const
uno::Reference< util::XCloseable >& xDo
}
if ( m_xFrame.is() )
- LoadDocToFrame(sal_False);
+ LoadDocToFrame(sal_False);
}
//---------------------------------------------------------------------------
sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
{
- if ( m_xFrame.is() && m_xComponent.is() )
+ if ( m_xFrame.is() && m_xComponent.is() )
{
uno::Reference < frame::XModel > xDoc( m_xComponent, uno::UNO_QUERY );
if ( xDoc.is() )
@@ -1029,12 +1029,12 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool
bInPlace )
aArgs.put( "PluginMode", sal_Int16(1) );
::rtl::OUString sUrl;
uno::Reference< lang::XServiceInfo>
xServiceInfo(xDoc,uno::UNO_QUERY);
- if ( xServiceInfo.is()
+ if ( xServiceInfo.is()
&&
xServiceInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportDefinition")))
)
{
sUrl =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/ReportDesign"));
}
- else if( xServiceInfo.is()
+ else if( xServiceInfo.is()
&& xServiceInfo->supportsService(
::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")) )
sUrl =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart"));
else
@@ -1057,7 +1057,7 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool
bInPlace )
}
}
- return sal_True;
+ return sal_True;
}
//---------------------------------------------------------------------------
@@ -1077,7 +1077,7 @@ void DocumentHolder::Show()
//---------------------------------------------------------------------------
sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
{
- uno::Reference< embed::XVisualObject > xDocVis( m_xComponent,
uno::UNO_QUERY );
+ uno::Reference< embed::XVisualObject > xDocVis( m_xComponent,
uno::UNO_QUERY );
if ( xDocVis.is() )
{
try
@@ -1097,7 +1097,7 @@ sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect,
const awt::Size& aSize )
//---------------------------------------------------------------------------
sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
{
- uno::Reference< embed::XVisualObject > xDocVis( m_xComponent,
uno::UNO_QUERY );
+ uno::Reference< embed::XVisualObject > xDocVis( m_xComponent,
uno::UNO_QUERY );
if ( pSize && xDocVis.is() )
{
try
@@ -1117,12 +1117,12 @@ sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect,
awt::Size *pSize )
//---------------------------------------------------------------------------
sal_Int32 DocumentHolder::GetMapUnit( sal_Int64 nAspect )
{
- uno::Reference< embed::XVisualObject > xDocVis( m_xComponent,
uno::UNO_QUERY );
+ uno::Reference< embed::XVisualObject > xDocVis( m_xComponent,
uno::UNO_QUERY );
if ( xDocVis.is() )
{
try
{
- return xDocVis->getMapUnit( nAspect );
+ return xDocVis->getMapUnit( nAspect );
}
catch( uno::Exception& )
{
@@ -1155,9 +1155,9 @@ awt::Rectangle DocumentHolder::AddBorderToArea( const
awt::Rectangle& aRect )
void SAL_CALL DocumentHolder::disposing( const
com::sun::star::lang::EventObject& aSource )
throw (uno::RuntimeException)
{
- if ( m_xComponent.is() && m_xComponent == aSource.Source )
+ if ( m_xComponent.is() && m_xComponent == aSource.Source )
{
- m_xComponent = 0;
+ m_xComponent = 0;
if ( m_bWaitForClose )
{
m_bWaitForClose = sal_False;
@@ -1178,7 +1178,7 @@ void SAL_CALL DocumentHolder::disposing( const
com::sun::star::lang::EventObject
void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource,
sal_Bool /*bGetsOwnership*/ )
throw (util::CloseVetoException, uno::RuntimeException)
{
- if ( m_xComponent.is() && m_xComponent == aSource.Source &&
!m_bAllowClosing )
+ if ( m_xComponent.is() && m_xComponent == aSource.Source &&
!m_bAllowClosing )
throw util::CloseVetoException();
}
@@ -1186,9 +1186,9 @@ void SAL_CALL DocumentHolder::queryClosing( const
lang::EventObject& aSource, sa
void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
throw (uno::RuntimeException)
{
- if ( m_xComponent.is() && m_xComponent == aSource.Source )
+ if ( m_xComponent.is() && m_xComponent == aSource.Source )
{
- m_xComponent = 0;
+ m_xComponent = 0;
if ( m_bWaitForClose )
{
m_bWaitForClose = sal_False;
@@ -1216,10 +1216,10 @@ void SAL_CALL DocumentHolder::queryTermination( const
lang::EventObject& )
void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject&
aSource )
throw (uno::RuntimeException)
{
- OSL_ENSURE( !m_xComponent.is(), "Just a disaster..." );
+ OSL_ENSURE( !m_xComponent.is(), "Just a disaster..." );
uno::Reference< frame::XDesktop > xDesktop( aSource.Source,
uno::UNO_QUERY );
- m_bDesktopTerminated = sal_True;
+ m_bDesktopTerminated = sal_True;
if ( xDesktop.is() )
xDesktop->removeTerminateListener( ( frame::XTerminateListener*
)this );
}
@@ -1238,7 +1238,7 @@ void SAL_CALL DocumentHolder::modified( const
lang::EventObject& aEvent )
void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event )
throw ( uno::RuntimeException )
{
- if( m_pEmbedObj && Event.Source == m_xComponent )
+ if( m_pEmbedObj && Event.Source == m_xComponent )
{
// for now the ignored events are not forwarded, but sent by
the object itself
if ( !Event.EventName.equalsAscii( "OnSave" )
@@ -1343,14 +1343,16 @@ void SAL_CALL DocumentHolder::activated( ) throw
(::com::sun::star::uno::Runtim
void DocumentHolder::ResizeHatchWindow()
{
- awt::Rectangle aHatchRect = AddBorderToArea( m_aObjRect );
- ResizeWindows_Impl( aHatchRect );
- uno::Reference< embed::XHatchWindow > xHatchWindow( m_xHatchWindow,
uno::UNO_QUERY );
- xHatchWindow->setHatchBorderSize( awt::Size( HATCH_BORDER_WIDTH,
HATCH_BORDER_WIDTH ) );
+ awt::Rectangle aHatchRect = AddBorderToArea( m_aObjRect );
+ ResizeWindows_Impl( aHatchRect );
+ uno::Reference< embed::XHatchWindow > xHatchWindow( m_xHatchWindow,
uno::UNO_QUERY );
+ xHatchWindow->setHatchBorderSize( awt::Size( HATCH_BORDER_WIDTH,
HATCH_BORDER_WIDTH ) );
}
void SAL_CALL DocumentHolder::deactivated( ) throw
(::com::sun::star::uno::RuntimeException)
{
- // deactivation is too unspecific to be useful; usually we only trigger
code from activation
- // so UIDeactivation is actively triggered by the container
+ // deactivation is too unspecific to be useful; usually we only trigger
code from activation
+ // so UIDeactivation is actively triggered by the container
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svtools/source/contnr/svimpbox.cxx
b/main/svtools/source/contnr/svimpbox.cxx
index c271a1f487..d14d33c8f4 100644
--- a/main/svtools/source/contnr/svimpbox.cxx
+++ b/main/svtools/source/contnr/svimpbox.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.
- *
+ *
*************************************************************/
@@ -59,8 +59,8 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList*
pLBTree, WinBits n
aOutputSize( 0, 0 ),
aSelEng( pLBView, (FunctionSet*)0 ),
aFctSet( this, &aSelEng, pLBView ),
- nExtendedWinBits( 0 ),
- bAreChildrenTransient( sal_True ),
+ nExtendedWinBits( 0 ),
+ bAreChildrenTransient( sal_True ),
pIntlWrapper( NULL ) // #102891# -----------------------
{
osl_incrementInterlockedCount(&s_nImageRefCount);
@@ -88,7 +88,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList*
pLBTree, WinBits n
pStartEntry = 0;
pCursor = 0;
pAnchor = 0;
- nVisibleCount = 0; // Anzahl Daten-Zeilen im Control
+ nVisibleCount = 0; // Anzahl Daten-Zeilen im Control
nNodeBmpTabDistance = NODE_BMP_TABDIST_NOTVALID;
nYoffsNodeBmp = 0;
nNodeBmpWidth = 0;
@@ -228,13 +228,13 @@ void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry,
Rectangle& rRect )
SvLBoxItem* pItem = pCursor->GetItem( nCurTabPos );
rRect.Left() = pView->GetTab( pCursor, pItem
)->GetPos();
}
- if ( pCursor->ItemCount() > ( nCurTabPos + 1 ) )
- {
- SvLBoxItem* pNextItem = pCursor->GetItem( nCurTabPos + 1 );
- long nRight = pView->GetTab( pCursor, pNextItem )->GetPos() - 1;
- if ( nRight < rRect.Right() )
- rRect.Right() = nRight;
- }
+ if ( pCursor->ItemCount() > ( nCurTabPos + 1 ) )
+ {
+ SvLBoxItem* pNextItem = pCursor->GetItem( nCurTabPos +
1 );
+ long nRight = pView->GetTab( pCursor, pNextItem
)->GetPos() - 1;
+ if ( nRight < rRect.Right() )
+ rRect.Right() = nRight;
+ }
}
}
@@ -610,7 +610,7 @@ void SvImpLBox::RecalcFocusRect()
}
//
-// Setzt Cursor. Passt bei SingleSelection die Selektion an
+// Setzt Cursor. Passt bei SingleSelection die Selektion an
//
void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect )
@@ -677,7 +677,7 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool
bForceNoSelect )
}
nFlags &= (~F_DESEL_ALL);
- pView->OnCurrentEntryChanged();
+ pView->OnCurrentEntryChanged();
}
void SvImpLBox::ShowCursor( sal_Bool bShow )
@@ -774,14 +774,14 @@ void SvImpLBox::KeyLeftRight( long nDelta )
// dem letzten Eintrag ist
SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const
{
- DBG_ASSERT( pView->GetModel(), "SvImpLBox::GetClickedEntry: how can this
ever happen? Please tell me (frank.schoenh...@sun.com) how to reproduce!" );
- if ( !pView->GetModel() )
- // this is quite impossible. Nevertheless, stack traces from the crash
reporter
- // suggest it isn't. Okay, make it safe, and wait for somebody to
reproduce it
- // reliably :-\ ....
- // #122359# / 2005-05-23 / frank.schoenh...@sun.com
- return NULL;
- if( pView->GetEntryCount() == 0 || !pStartEntry ||
!pView->GetEntryHeight())
+ DBG_ASSERT( pView->GetModel(), "SvImpLBox::GetClickedEntry: how can
this ever happen? Please tell me (frank.schoenh...@sun.com) how to reproduce!"
);
+ if ( !pView->GetModel() )
+ // this is quite impossible. Nevertheless, stack traces from
the crash reporter
+ // suggest it isn't. Okay, make it safe, and wait for somebody
to reproduce it
+ // reliably :-\ ....
+ // #122359# / 2005-05-23 / frank.schoenh...@sun.com
+ return NULL;
+ if( pView->GetEntryCount() == 0 || !pStartEntry ||
!pView->GetEntryHeight())
return 0;
sal_uInt16 nClickedEntry = (sal_uInt16)(rPoint.Y() /
pView->GetEntryHeight() );
@@ -791,8 +791,8 @@ SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point&
rPoint ) const
}
//
-// prueft, ob der Eintrag "richtig" getroffen wurde
-// (Focusrect+ ContextBitmap bei TreeListBox)
+// prueft, ob der Eintrag "richtig" getroffen wurde
+// (Focusrect+ ContextBitmap bei TreeListBox)
//
sal_Bool SvImpLBox::EntryReallyHit(SvLBoxEntry* pEntry,const Point&
rPosPixel,long nLine)
{
@@ -824,8 +824,8 @@ sal_Bool SvImpLBox::EntryReallyHit(SvLBoxEntry*
pEntry,const Point& rPosPixel,lo
SvLBoxEntry* SvImpLBox::GetEntry( const Point& rPoint ) const
{
if( (pView->GetEntryCount() == 0) || !pStartEntry ||
- (rPoint.Y() > aOutputSize.Height())
- || !pView->GetEntryHeight())
+ (rPoint.Y() > aOutputSize.Height())
+ || !pView->GetEntryHeight())
return 0;
sal_uInt16 nClickedEntry = (sal_uInt16)(rPoint.Y() /
pView->GetEntryHeight() );
@@ -960,15 +960,15 @@ void SvImpLBox::Paint( const Rectangle& rRect )
pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
}
- if ( !pCursor && ( ( nExtendedWinBits & EWB_NO_AUTO_CURENTRY ) == 0 ) )
+ if ( !pCursor && ( ( nExtendedWinBits & EWB_NO_AUTO_CURENTRY ) == 0 ) )
{
- // do not select if multiselection or explicit set
- sal_Bool bNotSelect = ( aSelEng.GetSelectionMode() ==
MULTIPLE_SELECTION )
- || ( ( m_nStyle & WB_NOINITIALSELECTION ) ==
WB_NOINITIALSELECTION );
- SetCursor( pStartEntry, bNotSelect );
+ // do not select if multiselection or explicit set
+ sal_Bool bNotSelect = ( aSelEng.GetSelectionMode() ==
MULTIPLE_SELECTION )
+ || ( ( m_nStyle & WB_NOINITIALSELECTION ) ==
WB_NOINITIALSELECTION );
+ SetCursor( pStartEntry, bNotSelect );
}
- nFlags &= (~F_DESEL_ALL);
+ nFlags &= (~F_DESEL_ALL);
pView->SetClipRegion();
Rectangle aRect;
if( !(nFlags & F_PAINTED) )
@@ -987,30 +987,30 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry,
sal_Bool bMoveToTop )
sal_Bool bInView = IsEntryInView( pEntry );
if( bInView && (!bMoveToTop || pStartEntry == pEntry) )
- return; // ist schon sichtbar
+ return; // ist schon sichtbar
if( pStartEntry || (m_nStyle & WB_FORCE_MAKEVISIBLE) )
nFlags &= (~F_FILLING);
if( !bInView )
{
- if( !pView->IsEntryVisible(pEntry) ) // Parent(s) zugeklappt ?
+ if( !pView->IsEntryVisible(pEntry) ) // Parent(s) zugeklappt ?
{
SvLBoxEntry* pParent = pView->GetParent( pEntry );
while( pParent )
{
if( !pView->IsExpanded( pParent ) )
{
- #ifdef DBG_UTIL
- sal_Bool bRet =
- #endif
- pView->Expand( pParent );
+ #ifdef DBG_UTIL
+ sal_Bool bRet =
+ #endif
+ pView->Expand( pParent );
DBG_ASSERT(bRet,"Not expanded!");
}
pParent = pView->GetParent( pParent );
}
// Passen Childs der Parents in View oder muessen wir
scrollen ?
if( IsEntryInView( pEntry ) && !bMoveToTop )
- return; // Scrollen nicht noetig -> tschuess
+ return; // Scrollen nicht noetig -> tschuess
}
}
@@ -1058,20 +1058,20 @@ void SvImpLBox::DrawNet()
!pStartEntry->HasChilds() )
return;
- //for platforms who don't have nets, DrawNativeControl does nothing and
return true
- //so that SvImpLBox::DrawNet() doesn't draw anything too
+ //for platforms who don't have nets, DrawNativeControl does nothing and
return true
+ //so that SvImpLBox::DrawNet() doesn't draw anything too
if(pView->IsNativeControlSupported( CTRL_LISTNET, PART_ENTIRE_CONTROL))
{
- ImplControlValue aControlValue;
- Point aTemp(0,0); // temporary needed for g++ 3.3.5
- Rectangle aCtrlRegion( aTemp, Size( 0, 0 ) );
- ControlState nState = CTRL_STATE_ENABLED;
- if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL,
- aCtrlRegion, nState, aControlValue,
rtl::OUString() ) )
- {
- return;
- }
-
- }
+ ImplControlValue aControlValue;
+ Point aTemp(0,0); // temporary needed for g++ 3.3.5
+ Rectangle aCtrlRegion( aTemp, Size( 0, 0 ) );
+ ControlState nState = CTRL_STATE_ENABLED;
+ if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL,
+
aCtrlRegion, nState, aControlValue, rtl::OUString() ) )
+ {
+ return;
+ }
+
+ }
long nEntryHeight = pView->GetEntryHeight();
long nEntryHeightDIV2 = nEntryHeight / 2;
@@ -1157,7 +1157,7 @@ void SvImpLBox::DrawNet()
// unter den ersten Text (Node.Bmp ebenfalls
if( !pView->nContextBmpWidthMax )
aPos1.X() += rExpandedNodeBitmap.GetSizePixel().Width()
/ 2;
- aPos1.X() -= pView->GetIndent();
+ aPos1.X() -= pView->GetIndent();
aPos1.Y() = GetEntryLine( pEntry );
aPos1.Y() += nEntryHeightDIV2;
pChild = pTree->LastSibling( pEntry );
@@ -1243,7 +1243,7 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
Size aOSize( pView->Control::GetOutputSizePixel() );
- const WinBits nWindowStyle = pView->GetStyle();
+ const WinBits nWindowStyle = pView->GetStyle();
sal_Bool bVerSBar = ( nWindowStyle & WB_VSCROLL ) != 0;
sal_Bool bHorBar = sal_False;
long nMaxRight = aOSize.Width(); //GetOutputSize().Width();
@@ -1263,7 +1263,7 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
nVisibleCount = aOSize.Height() / nEntryHeight;
// muessen wir eine vertikale Scrollbar einblenden?
- if( bVerSBar || nTotalCount > nVisibleCount )
+ if( bVerSBar || nTotalCount > nVisibleCount )
{
nResult = 1;
nFlags |= F_HOR_SBARSIZE_WITH_VBAR;
@@ -1283,10 +1283,10 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
// die Anzahl der in der View sichtbaren Eintraege
// muss neu berechnet werden, da die horizontale
// ScrollBar eingeblendet wird
- nVisibleCount = (aOSize.Height() - nHorSBarHeight) /
nEntryHeight;
+ nVisibleCount = (aOSize.Height() - nHorSBarHeight) /
nEntryHeight;
// eventuell brauchen wir jetzt doch eine vertikale ScrollBar
if( !(nResult & 0x0001) &&
- ((nTotalCount > nVisibleCount) || bVerSBar) )
+ ((nTotalCount > nVisibleCount) || bVerSBar) )
{
nResult = 3;
nFlags |= F_VER_SBARSIZE_WITH_HBAR;
@@ -1402,7 +1402,7 @@ void SvImpLBox::FillView()
sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos(
(SvLBoxEntry*)(pView->LastVisible())));
sal_uInt16 nThumb = (sal_uInt16)(pView->GetVisiblePos(
pStartEntry ));
sal_uInt16 nCurDispEntries = nLast-nThumb+1;
- if( nCurDispEntries < nVisibleCount )
+ if( nCurDispEntries < nVisibleCount )
{
ShowCursor( sal_False );
// Fenster fuellen, indem der Thumb schrittweise
@@ -1462,7 +1462,7 @@ void SvImpLBox::ShowVerSBar()
Point aPos( pView->GetMapMode().GetOrigin() );
aPos.X() *= -1; // Umrechnung Dokumentkoord.
nMaxRight = nMaxRight + aPos.X() - 1;
- if( nMaxRight < nMostRight )
+ if( nMaxRight < nMostRight )
{
if( !aHorSBar.IsVisible() )
{
@@ -1595,11 +1595,11 @@ void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry )
if( pStartEntry )
{
- long nOldThumbPos = aVerSBar.GetThumbPos();
- sal_uLong nVisList = pView->GetVisibleCount();
+ long nOldThumbPos = aVerSBar.GetThumbPos();
+ sal_uLong nVisList = pView->GetVisibleCount();
aVerSBar.SetRange( Range(0, nVisList-1) );
- long nNewThumbPos = aVerSBar.GetThumbPos();
- if( nNewThumbPos != nOldThumbPos )
+ long nNewThumbPos = aVerSBar.GetThumbPos();
+ if( nNewThumbPos != nOldThumbPos )
{
pStartEntry = pView->First();
sal_uInt16 nDistance = (sal_uInt16)nNewThumbPos;
@@ -1828,7 +1828,7 @@ void SvImpLBox::EntryRemoved()
void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry )
{
int bDeselAll = nFlags & F_DESEL_ALL;
- SelAllDestrAnch( sal_False, sal_True ); // DeselectAll();
+ SelAllDestrAnch( sal_False, sal_True ); // DeselectAll();
if( !bDeselAll )
nFlags &= (~F_DESEL_ALL);
@@ -1860,10 +1860,10 @@ void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry )
// #97680# --------------
UpdateContextBmpWidthVectorFromMovedEntry( pEntry );
- if ( !pStartEntry )
- // this might happen if the only entry in the view is moved to its
very same position
- // #i97346#
- pStartEntry = pView->First();
+ if ( !pStartEntry )
+ // this might happen if the only entry in the view is moved to
its very same position
+ // #i97346#
+ pStartEntry = pView->First();
aVerSBar.SetRange( Range(0, pView->GetVisibleCount()-1));
sal_uInt16 nFirstPos = (sal_uInt16)pTree->GetAbsPos( pStartEntry );
@@ -2129,7 +2129,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
nFlags &= (~F_FILLING);
pView->GrabFocus();
// #120417# the entry can still be invalid!
- if( !pEntry || !pView->GetViewData( pEntry ))
+ if( !pEntry || !pView->GetViewData( pEntry ))
return;
long nY = GetEntryLine( pEntry );
@@ -2178,8 +2178,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
pView->Collapse( pEntry );
else
pView->Expand( pEntry );
- if( pEntry == pCursor ) // nur wenn Entryitem
angeklickt wurde
-
// (Nodebutton ist kein Entryitem!)
+ if( pEntry == pCursor ) // nur wenn Entryitem
angeklickt wurde
+
// (Nodebutton ist kein Entryitem!)
pView->Select( pCursor, sal_True );
return;
}
@@ -2201,8 +2201,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
}
#endif
}
- if ( aSelEng.GetSelectionMode() != NO_SELECTION )
- aSelEng.SelMouseButtonDown( rMEvt );
+ if ( aSelEng.GetSelectionMode() != NO_SELECTION )
+ aSelEng.SelMouseButtonDown( rMEvt );
}
void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
@@ -2255,15 +2255,15 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
sal_Bool bKeyUsed = sal_True;
- sal_uInt16 nDelta = (sal_uInt16)aVerSBar.GetPageSize();
- sal_uInt16 aCode = rKeyCode.GetCode();
+ sal_uInt16 nDelta = (sal_uInt16)aVerSBar.GetPageSize();
+ sal_uInt16 aCode = rKeyCode.GetCode();
- sal_Bool bShift = rKeyCode.IsShift();
- sal_Bool bMod1 = rKeyCode.IsMod1();
+ sal_Bool bShift = rKeyCode.IsShift();
+ sal_Bool bMod1 = rKeyCode.IsMod1();
SvLBoxEntry* pNewCursor;
- const WinBits nWindowStyle = pView->GetStyle();
+ const WinBits nWindowStyle = pView->GetStyle();
switch( aCode )
{
case KEY_UP:
@@ -2331,22 +2331,22 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
}
else
KeyDown( sal_False ); // weil ScrollBar-Range
evtl. noch
- // scrollen
erlaubt
+ //
scrollen erlaubt
break;
case KEY_RIGHT:
{
if( bSubLstOpLR && IsNowExpandable() )
pView->Expand( pCursor );
- else if ( bIsCellFocusEnabled && pCursor )
- {
- if ( nCurTabPos < ( pView->TabCount() - 1 /*!2*/ ) )
- {
- ++nCurTabPos;
- ShowCursor( sal_True );
- CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
- }
- }
+ else if ( bIsCellFocusEnabled && pCursor )
+ {
+ if ( nCurTabPos < ( pView->TabCount() - 1
/*!2*/ ) )
+ {
+ ++nCurTabPos;
+ ShowCursor( sal_True );
+ CallEventListeners(
VCLEVENT_LISTBOX_SELECT, pCursor );
+ }
+ }
else if( nWindowStyle & WB_HSCROLL )
{
long nThumb = aHorSBar.GetThumbPos();
@@ -2369,17 +2369,17 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
case KEY_LEFT:
{
- // if ( bIsCellFocusEnabled )
- if ( bIsCellFocusEnabled && pCursor )
- {
- if ( nCurTabPos > FIRST_ENTRY_TAB )
- {
- --nCurTabPos;
- ShowCursor( sal_True );
- CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
- }
- }
- else if ( nWindowStyle & WB_HSCROLL )
+ // if ( bIsCellFocusEnabled )
+ if ( bIsCellFocusEnabled && pCursor )
+ {
+ if ( nCurTabPos > FIRST_ENTRY_TAB )
+ {
+ --nCurTabPos;
+ ShowCursor( sal_True );
+ CallEventListeners(
VCLEVENT_LISTBOX_SELECT, pCursor );
+ }
+ }
+ else if ( nWindowStyle & WB_HSCROLL )
{
long nThumb = aHorSBar.GetThumbPos();
nThumb -= aHorSBar.GetLineSize();
@@ -2470,32 +2470,32 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
break;
case KEY_SPACE:
- if ( pView->GetSelectionMode() != NO_SELECTION )
- {
- if ( bMod1 )
- {
- if ( pView->GetSelectionMode() ==
MULTIPLE_SELECTION && !bShift )
- // toggle selection
- pView->Select( pCursor,
!pView->IsSelected( pCursor ) );
- }
- else if ( !bShift /*&& !bMod1*/ )
- {
- if ( aSelEng.IsAddMode() )
- {
- // toggle selection
- pView->Select( pCursor,
!pView->IsSelected( pCursor ) );
- }
- else if ( !pView->IsSelected( pCursor ) )
- {
- SelAllDestrAnch( sal_False );
- pView->Select( pCursor, sal_True );
- }
- else
- bKeyUsed = sal_False;
- }
- else
- bKeyUsed = sal_False;
- }
+ if ( pView->GetSelectionMode() != NO_SELECTION )
+ {
+ if ( bMod1 )
+ {
+ if ( pView->GetSelectionMode() ==
MULTIPLE_SELECTION && !bShift )
+ // toggle selection
+ pView->Select( pCursor,
!pView->IsSelected( pCursor ) );
+ }
+ else if ( !bShift /*&& !bMod1*/ )
+ {
+ if ( aSelEng.IsAddMode() )
+ {
+ // toggle selection
+ pView->Select( pCursor,
!pView->IsSelected( pCursor ) );
+ }
+ else if ( !pView->IsSelected( pCursor )
)
+ {
+ SelAllDestrAnch( sal_False );
+ pView->Select( pCursor,
sal_True );
+ }
+ else
+ bKeyUsed = sal_False;
+ }
+ else
+ bKeyUsed = sal_False;
+ }
else
bKeyUsed = sal_False;
break;
@@ -2684,15 +2684,15 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
break;
default:
- // is there any reason why we should eat the events here? The only
place where this is called
- // is from SvTreeListBox::KeyInput. If we set bKeyUsed to sal_True
here, then the key input
- // is just silenced. However, we want SvLBox::KeyInput to get a
chance, to do the QuickSelection
- // handling.
- // (The old code here which intentionally set bKeyUsed to sal_True
said this was because of "quick search"
- // handling, but actually there was no quick search handling
anymore. We just re-implemented it.)
- // #i31275# / 2009-06-16 / frank.schoenh...@sun.com
+ // is there any reason why we should eat the events
here? The only place where this is called
+ // is from SvTreeListBox::KeyInput. If we set bKeyUsed
to sal_True here, then the key input
+ // is just silenced. However, we want SvLBox::KeyInput
to get a chance, to do the QuickSelection
+ // handling.
+ // (The old code here which intentionally set bKeyUsed
to sal_True said this was because of "quick search"
+ // handling, but actually there was no quick search
handling anymore. We just re-implemented it.)
+ // #i31275# / 2009-06-16 / frank.schoenh...@sun.com
bKeyUsed = sal_False;
- break;
+ break;
}
return bKeyUsed;
}
@@ -2807,7 +2807,7 @@ void __EXPORT ImpLBSelEng::CreateCursor()
sal_Bool __EXPORT ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, sal_Bool
bDontSelectAtCursor)
{
SvLBoxEntry* pNewCursor = pImp->MakePointVisible( rPoint );
- if( pNewCursor != pImp->pCursor )
+ if( pNewCursor != pImp->pCursor )
pImp->BeginScroll();
if( pNewCursor )
@@ -2919,7 +2919,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry*
pOldCursor,SvLBoxEntry* pNewCurs
}
else
{
- if( nNewVisPos < nOldVisPos ) // Vergroessern der Selektion
+ if( nNewVisPos < nOldVisPos ) // Vergroessern der Selektion
{
pEntry = pNewCursor;
while( pEntry && pEntry != pOldCursor )
@@ -3031,7 +3031,7 @@ void SvImpLBox::SelAllDestrAnch( sal_Bool bSelect,
sal_Bool bDestroyAnchor,
ShowCursor( sal_True );
}
-void SvImpLBox::SetSelectionMode( SelectionMode eSelMode )
+void SvImpLBox::SetSelectionMode( SelectionMode eSelMode )
{
aSelEng.SetSelectionMode( eSelMode);
if( eSelMode == SINGLE_SELECTION )
@@ -3101,27 +3101,27 @@ void SvImpLBox::PaintDDCursor( SvLBoxEntry*
pInsertionPos )
pView->SetRasterOp( eOldOp );
}
/* -----------------26.08.2003 12:52-----------------
- Delete all sub menues of a PopupMenu, recursively
+ Delete all sub menus of a PopupMenu, recursively
--------------------------------------------------*/
void lcl_DeleteSubPopups(PopupMenu* pPopup)
{
- for(sal_uInt16 i = 0; i < pPopup->GetItemCount(); i++)
- {
- PopupMenu* pSubPopup = pPopup->GetPopupMenu( pPopup->GetItemId( i ));
- if(pSubPopup)
+ for(sal_uInt16 i = 0; i < pPopup->GetItemCount(); i++)
+ {
+ PopupMenu* pSubPopup = pPopup->GetPopupMenu( pPopup->GetItemId(
i ));
+ if(pSubPopup)
{
- lcl_DeleteSubPopups(pSubPopup);
+ lcl_DeleteSubPopups(pSubPopup);
delete pSubPopup;
}
- }
+ }
}
void SvImpLBox::Command( const CommandEvent& rCEvt )
{
sal_uInt16 nCommand = rCEvt.GetCommand();
- if( nCommand == COMMAND_CONTEXTMENU )
- aEditTimer.Stop();
+ if( nCommand == COMMAND_CONTEXTMENU )
+ aEditTimer.Stop();
// Rollmaus-Event?
if( ( ( nCommand == COMMAND_WHEEL ) || ( nCommand ==
COMMAND_STARTAUTOSCROLL ) || ( nCommand == COMMAND_AUTOSCROLL ) )
@@ -3211,11 +3211,11 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
if( pPopup )
{
// do action for selected entry in popup menu
- sal_uInt16 nMenuAction = pPopup->Execute( pView, aPopupPos );
- if ( nMenuAction )
- pView->ExcecuteContextMenuAction( nMenuAction );
- lcl_DeleteSubPopups(pPopup);
- delete pPopup;
+ sal_uInt16 nMenuAction = pPopup->Execute( pView,
aPopupPos );
+ if ( nMenuAction )
+ pView->ExcecuteContextMenuAction( nMenuAction );
+ lcl_DeleteSubPopups(pPopup);
+ delete pPopup;
}
//added by BerryJia for fixing Bug102739 2002-9-9 17:00(Beijing
Time)
if( bClickedIsFreePlace )
@@ -3282,13 +3282,13 @@ void SvImpLBox::Invalidate()
void SvImpLBox::SetCurEntry( SvLBoxEntry* pEntry )
{
if ( ( aSelEng.GetSelectionMode() != SINGLE_SELECTION )
- && ( aSelEng.GetSelectionMode() != NO_SELECTION )
- )
+ && ( aSelEng.GetSelectionMode() != NO_SELECTION )
+ )
SelAllDestrAnch( sal_False, sal_True, sal_False );
- if ( pEntry )
- MakeVisible( pEntry );
+ if ( pEntry )
+ MakeVisible( pEntry );
SetCursor( pEntry );
- if ( pEntry && ( aSelEng.GetSelectionMode() != NO_SELECTION ) )
+ if ( pEntry && ( aSelEng.GetSelectionMode() != NO_SELECTION ) )
pView->Select( pEntry, sal_True );
}
@@ -3480,7 +3480,7 @@ void SvImpLBox::FindMostRight( SvLBoxEntry* pParent,
SvLBoxEntry* pEntryToIgnore
if( !pParent )
FindMostRight( pEntryToIgnore );
else
- FindMostRight_Impl( pParent, pEntryToIgnore );
+ FindMostRight_Impl( pParent, pEntryToIgnore );
}
void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry*
pEntryToIgnore )
@@ -3635,3 +3635,4 @@ bool SvImpLBox::IsSelectable( const SvLBoxEntry* pEntry )
}
}
+/* vim: set noet sw=4 ts=4: */
