[Libreoffice-commits] .: 2 commits - desktop/source desktop/win32 desktop/WinResTarget_quickstart.mk
desktop/WinResTarget_quickstart.mk |2 desktop/source/app/app.cxx |2 desktop/win32/source/QuickStart/OOQuickStart.rc | 130 --- desktop/win32/source/QuickStart/QuickStart.cxx |7 - desktop/win32/source/QuickStart/QuickStart.rc| 130 +++ desktop/win32/source/QuickStart/so/QuickStart.rc | 130 --- 6 files changed, 135 insertions(+), 266 deletions(-) New commits: commit 3ac61e97198354439ceac8969277585cb8d4cb18 Author: Andras Timar ati...@suse.com Date: Sun Dec 4 13:20:20 2011 +0100 remove StarOffice-only file diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 0c28ece..57e6358 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -35,6 +35,6 @@ $(eval $(call gb_WinResTarget_add_dependency,quickstart/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/OOQuickStart)) +$(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/QuickStart)) # vim: set ts=4 sw=4 et: diff --git a/desktop/win32/source/QuickStart/OOQuickStart.rc b/desktop/win32/source/QuickStart/OOQuickStart.rc deleted file mode 100644 index 2fdfa7d..000 --- a/desktop/win32/source/QuickStart/OOQuickStart.rc +++ /dev/null @@ -1,130 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include resource.h - -#define APSTUDIO_READONLY_SYMBOLS -/ -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include windows.h -#undef APSTUDIO_HIDDEN_SYMBOLS -#include resource.h - -/ -#undef APSTUDIO_READONLY_SYMBOLS - -/ -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -/ -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -ICON_ACTIVE ICONDISCARDABLE icons/main_app.ico -IDI_QUICKSTART ICONDISCARDABLE icons/main_app.ico -IDI_SMALL ICONDISCARDABLE icons/main_app.ico -ICON_INACTIVE ICONDISCARDABLE icons/main_app.ico - - -/ -// -// Accelerator -// - -IDC_QUICKSTART ACCELERATORS MOVEABLE PURE -BEGIN -?,IDM_ABOUT, ASCII, ALT -/,IDM_ABOUT, ASCII, ALT -END - - -/ -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION About -FONT 8, System -BEGIN -ICONIDI_QUICKSTART,IDC_MYICON,14,9,16,16 -LTEXT QuickStart Version 1.0,IDC_STATIC,49,10,119,8, -SS_NOPREFIX -LTEXT Copyright (C) 2001,IDC_STATIC,49,20,119,8 -DEFPUSHBUTTON OK,IDOK,195,6,30,11,WS_GROUP -END - - -#ifdef APSTUDIO_INVOKED -/ -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE DISCARDABLE -BEGIN -#define APSTUDIO_HIDDEN_SYMBOLS\r\n -#include windows.h\r\n -#undef APSTUDIO_HIDDEN_SYMBOLS\r\n -#include resource.h\r\n -\0 -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN -\r\n -\0 -END - -1 TEXTINCLUDE DISCARDABLE -BEGIN -resource.h\0 -END - -#endif// APSTUDIO_INVOKED - - -/ -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN -IDS_APP_TITLE SoQuickStart -IDC_QUICKSTART QUICKSTART -IDS_TOOLTIP StarOffice 6.0 QuickStart -END - -STRINGTABLE DISCARDABLE -BEGIN -IDS_EXITExit -END - -#endif// German (Germany) resources -/ - - - -#ifndef APSTUDIO_INVOKED -/ -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -/ -#endif// not APSTUDIO_INVOKED - diff --git a/desktop/win32/source/QuickStart/QuickStart.rc b/desktop/win32/source/QuickStart/QuickStart.rc new file mode 100644 index 000..2fdfa7d --- /dev/null +++ b/desktop/win32/source/QuickStart/QuickStart.rc @@ -0,0 +1,130 @@ +//Microsoft Developer Studio generated resource script. +//
[Libreoffice-commits] .: desktop/win32
desktop/win32/source/QuickStart/QuickStart.cxx | 353 -
desktop/win32/source/QuickStart/QuickStart.rc | 127
desktop/win32/source/QuickStart/resource.h | 32 --
3 files changed, 1 insertion(+), 511 deletions(-)
New commits:
commit 6411ad12f2dac9525f720662692cf712801f8c5b
Author: Andras Timar ati...@suse.com
Date: Sun Dec 4 14:50:37 2011 +0100
code cleanup of Windows quickstarter
diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx
b/desktop/win32/source/QuickStart/QuickStart.cxx
index 26276ba..b3e19a5 100644
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -7,37 +7,10 @@
#include systools/win32/uwinapi.h
#include stdio.h
-#define MY_TASKBAR_NOTIFICATION WM_USER+1
-
-#define MAX_LOADSTRING 100
-
// message used to communicate with soffice
-#define TERMINATIONVETO_MESSAGE SO TerminationVeto
-#define TERMINATE_MESSAGE SO Terminate
#define LISTENER_WINDOWCLASSSO Listener Class
#define KILLTRAY_MESSAGESO KillTray
-static UINT aTerminationVetoMessage = 0x7FFF;
-static UINT aTerminateMessage = 0x7FFF;
-static HMENU popupMenu = NULL;
-static bool bTerminateVeto = true;
-
-#define UPDATE_TIMER 1
-
-// Global Variables:
-HINSTANCE hInst;// current instance
-TCHAR szTitle[MAX_LOADSTRING]; // The title bar text
-TCHAR szWindowClass[MAX_LOADSTRING];// The title bar text
-
-TCHAR szExitString[MAX_LOADSTRING];
-TCHAR szTooltipString[MAX_LOADSTRING];
-
-// Foward declarations of functions included in this code module:
-ATOMMyRegisterClass(HINSTANCE hInstance);
-BOOLInitInstance(HINSTANCE, int);
-LRESULT CALLBACKWndProc(HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACKAbout(HWND, UINT, WPARAM, LPARAM);
-
bool SofficeRuns()
{
// check for soffice by searching the communication window
@@ -66,58 +39,13 @@ bool launchSoffice( )
UINT ret = WinExec( imagename, SW_SHOW );
if ( ret 32 )
return false;
-/*
-// wait until we can communicate
-int retry = 30;
-while (retry-- !SofficeRuns() )
-Sleep(1000);
-return SofficeRuns();
-*/
return true;
}
else
return true;
}
-void NotifyListener( HWND hWnd )
-{
-static HICON hIconActive=NULL;
-//static HICON hIconInActive=NULL;
-
-if( !hIconActive )
-{
-hIconActive = (HICON)LoadImage( GetModuleHandle( NULL ),
MAKEINTRESOURCE( ICON_ACTIVE ),
-IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics(
SM_CYSMICON ),
-LR_DEFAULTCOLOR | LR_SHARED );
-
-/*hIconInActive = (HICON)LoadImage( GetModuleHandle( NULL ),
MAKEINTRESOURCE( ICON_INACTIVE ),
-IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics(
SM_CYSMICON ),
-LR_DEFAULTCOLOR | LR_SHARED );
-*/
-}
-
-NOTIFYICONDATA nid;
-nid.cbSize = sizeof(NOTIFYICONDATA);
-nid.hWnd = hWnd;
-nid.uID= IDM_QUICKSTART;
-nid.szTip[SAL_N_ELEMENTS(nid.szTip) - 1] = 0;
-//nid.hIcon = bTerminateVeto ? hIconActive : hIconInActive;
-//strncpy(nid.szTip, bTerminateVeto ? STRING_QUICKSTARTACTIVE :
STRING_QUICKSTARTINACTIVE, SAL_N_ELEMENTS(nid.szTip) - 1 );
-nid.hIcon = hIconActive;
-strncpy(nid.szTip, szTooltipString, SAL_N_ELEMENTS(nid.szTip) - 1);
-nid.uFlags = NIF_TIP|NIF_ICON;
-
-// update systray
-Shell_NotifyIcon( NIM_MODIFY, nid );
-//CheckMenuItem( popupMenu, IDM_QUICKSTART, bTerminateVeto ? MF_CHECKED :
MF_UNCHECKED );
-
-// notify listener
-SendMessage( HWND_BROADCAST, aTerminationVetoMessage, (WORD)
bTerminateVeto, 0L );
-}
-
-
-
int APIENTRY WinMain(HINSTANCE /*hInstance*/,
HINSTANCE /*hPrevInstance*/,
LPSTR /*lpCmdLine*/,
@@ -143,287 +71,6 @@ int APIENTRY WinMain(HINSTANCE /*hInstance*/,
launchSoffice();
return 0;
-
-#if 0 // Note unconditional return 0 above. Do not remove this block of code
- // unless you are sure it will never be needed even for reference.
-
- // TODO: Place code here.
-MSG msg;
-HACCEL hAccelTable;
-aTerminationVetoMessage = RegisterWindowMessage( TERMINATIONVETO_MESSAGE );
-aTerminateMessage = RegisterWindowMessage( TERMINATE_MESSAGE );
-
-// Initialize global strings
-LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-LoadString(hInstance, IDC_QUICKSTART, szWindowClass, MAX_LOADSTRING);
-
-LoadString(hInstance, IDS_EXIT,szExitString, MAX_LOADSTRING);
-LoadString(hInstance, IDS_TOOLTIP, szTooltipString, MAX_LOADSTRING);
-
-MyRegisterClass(hInstance);
-
-// Perform application initialization:
-if (!InitInstance (hInstance, nCmdShow))
-{
-return FALSE;
-}
-
-hAccelTable = LoadAccelerators(hInstance,
[Libreoffice-commits] .: vcl/inc vcl/win
dev/null |binary vcl/inc/win/salids.hrc |2 -- vcl/win/source/app/salinst.cxx |1 - vcl/win/source/src/salsrc.rc |2 -- 4 files changed, 5 deletions(-) New commits: commit 915fe51391bdeee79f31173aeedab9746fc88000 Author: Andras Timar ati...@suse.com Date: Sun Dec 4 15:07:50 2011 +0100 remove StarDesktop icon diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc index 3049f11..574bdc0 100644 --- a/vcl/inc/win/salids.hrc +++ b/vcl/inc/win/salids.hrc @@ -115,6 +115,4 @@ #define SAL_RESID_BITMAP_50 11000 -#define SAL_RESID_ICON_DEFAULT 1 - #endif // _SV_SALIDS_HRC diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 90841f7..d3fce7c 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -541,7 +541,6 @@ SalInstance* CreateSalInstance() aWndClassEx.hbrBackground = 0; aWndClassEx.lpszMenuName= 0; aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW; -ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, aWndClassEx.hIconSm ); if ( !RegisterClassExW( aWndClassEx ) ) return NULL; diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 147b80f..956f862 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -117,6 +117,4 @@ SAL_RESID_POINTER_PAINTBRUSHCURSOR pntbrsh.cur SAL_RESID_BITMAP_50 BITMAP 50.bmp -SAL_RESID_ICON_DEFAULT ICONsd.ico - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/src/sd.ico b/vcl/win/source/src/sd.ico deleted file mode 100644 index b2a0a07..000 Binary files a/vcl/win/source/src/sd.ico and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/WinResTarget_vcl.mk
vcl/WinResTarget_vcl.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 9c9dbc1e26a268e0f1e7ceaccec384b3cde70a2b Author: Andras Timar ati...@suse.com Date: Sun Dec 4 15:10:44 2011 +0100 remove StarDesktop icon from the makefile, too diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index 2a6bc80..b6a0ca0 100644 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -52,7 +52,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/win/source/src/copyf.cur \ vcl/win/source/src/drect.cur \ vcl/win/source/src/movef.cur \ -vcl/win/source/src/sd.ico \ vcl/win/source/src/ase.cur \ vcl/win/source/src/copyf2.cur \ vcl/win/source/src/dtext.cur \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl | 33 ---
solenv/bin/modules/installer/epmfile.pm | 46
solenv/bin/modules/installer/globals.pm |6
solenv/bin/modules/installer/parameter.pm | 21 --
solenv/bin/modules/installer/systemactions.pm |8
solenv/bin/modules/installer/worker.pm| 256 --
6 files changed, 370 deletions(-)
New commits:
commit 0411cd764bc960ad737d67cffac3fa81d483e317
Author: Andras Timar ati...@suse.com
Date: Sun Dec 4 15:32:26 2011 +0100
remove packaging for Java Desktop System (JDS)
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5ebd70f..c9d9f02 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -632,14 +632,12 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
$installer::globals::addlicensefile = 0;# no license files for
patches
$installer::globals::makedownload = 0;
-$installer::globals::makejds = 0;
}
if ( $installer::globals::languagepack )
{
$installer::globals::addchildprojects = 0;
$installer::globals::addsystemintegration = 0;
-$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
}
@@ -648,7 +646,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
$installer::globals::addchildprojects = 0;
$installer::globals::addsystemintegration = 0;
-$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
}
@@ -1872,36 +1869,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::worker::analyze_and_save_logfile($loggingdir,
$downloaddir, $installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
}
}
-
-###
-# Creating jds installation set
-###
-
-if ( $installer::globals::makejds )
-{
-my $create_jds = 0;
-
-if ( $allvariableshashref-{'JDSBUILD'} ) { $create_jds = 1; }
-if (! $installer::globals::issolarispkgbuild ) { $create_jds = 0; }
-
-if (( $is_success ) ( $create_jds ))
-{
-if ( ! $installer::globals::jds_language_controlled )
-{
-my $correct_language =
installer::worker::check_jds_language($allvariableshashref, $languagestringref);
-$installer::globals::correct_jds_language =
$correct_language;
-$installer::globals::jds_language_controlled = 1;
-}
-
-if ( $installer::globals::correct_jds_language )
-{
-my $jdsdir =
installer::worker::create_jds_sets($finalinstalldir, $allvariableshashref,
$languagestringref, $languagesarrayref, $includepatharrayref);
-installer::worker::clean_jds_temp_dirs();
-installer::worker::analyze_and_save_logfile($loggingdir,
$jdsdir, $installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
-}
-}
-}
-
} # end of if (!( $installer::globals::iswindowsbuild ))
if ( $installer::globals::debug ) { installer::logger::debuginfo(\nEnd of
part 2a: All non-Windows platforms\n); }
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index eff03a5..76c1792 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2391,52 +2391,6 @@ sub create_packages_without_epm
# It might be necessary to save uncompressed Solaris packages
-if ( $allvariables-{'JDSBUILD'} )
-{
-if ( ! $installer::globals::jds_language_controlled )
-{
-my $correct_language =
installer::worker::check_jds_language($allvariables, $languagestringref);
-$installer::globals::correct_jds_language = $correct_language;
-$installer::globals::jds_language_controlled = 1;
-}
-
-if ( $installer::globals::correct_jds_language )
-{
-if ( $installer::globals::saved_packages_path eq )
-{
-$packagestempdir =
installer::systemactions::create_directories(jds, $languagestringref);
-$installer::globals::saved_packages_path =
$packagestempdir;
-push(@installer::globals::jdsremovedirs, $packagestempdir);
-}
-
-$systemcall = cd $destinationdir; cp -p -R $packagename
$installer::globals::saved_packages_path;;
-
[Libreoffice-commits] .: 3 commits - sc/source
sc/source/core/data/table1.cxx | 82 -
1 file changed, 48 insertions(+), 34 deletions(-)
New commits:
commit e42ee773ffc12e38d596ce2aa016f0849c4e5ac6
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Tue Nov 29 09:10:26 2011 +0100
reduce scope of var and better comment of function GetDataArea
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 3c142c1..06b8203 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -743,17 +743,19 @@ bool ScTable::GetDataStart( SCCOL rStartCol, SCROW
rStartRow ) const
void ScTable::GetDataArea( SCCOL rStartCol, SCROW rStartRow, SCCOL rEndCol,
SCROW rEndRow,
bool bIncludeOld, bool bOnlyDown ) const
{
-// bIncludeOld = true ensure that the returned area contains at least the
initial area,
-// independently of the case if this area has empty rows /
columns at its borders
-// bOnlyDown = true means extend the inputed area only down, i.e increase
only rEndRow
+// return the smallest area containing at least all contiguous cells
having data. This area
+// is a square containing also empty cells. It may shrink or extend the
area given as input
+// Flags as modifiers:
+//
+// bIncludeOld = true ensure that the returned area contains at least
the initial area,
+// independently of the emptniess of rows / columns
(i.e. does not allow shrinking)
+// bOnlyDown = true means extend / shrink the inputed area only down,
i.e modifiy only rEndRow
+
bool bLeft = false;
bool bRight = false;
bool bTop = false;
bool bBottom = false;
-bool bChanged;
-bool bFound;
-SCCOL i;
-SCROW nTest;
+bool bChanged = false;
do
{
@@ -784,12 +786,12 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW
rStartRow, SCCOL rEndCol, S
if (rStartRow 0)
{
-nTest = rStartRow-1;
-bFound = false;
-for (i=rStartCol; i=rEndCol !bFound; i++)
+SCROW nTest = rStartRow-1;
+bool needExtend = false;
+for ( SCCOL i = rStartCol; i=rEndCol !needExtend; i++)
if (aCol[i].HasDataAt(nTest))
-bFound = true;
-if (bFound)
+needExtend = true;
+if (needExtend)
{
--rStartRow;
bChanged = true;
@@ -800,12 +802,12 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW
rStartRow, SCCOL rEndCol, S
if (rEndRow MAXROW)
{
-nTest = rEndRow+1;
-bFound = false;
-for (i=rStartCol; i=rEndCol !bFound; i++)
+SCROW nTest = rEndRow+1;
+bool needExtend = false;
+for ( SCCOL i = rStartCol; i=rEndCol !needExtend; i++)
if (aCol[i].HasDataAt(nTest))
-bFound = true;
-if (bFound)
+needExtend = true;
+if (needExtend)
{
++rEndRow;
bChanged = true;
@@ -830,7 +832,7 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW
rStartRow, SCCOL rEndCol, S
bool shrink = true;
do
{
-for (i=rStartCol; i=rEndCol shrink; i++)
+for ( SCCOL i = rStartCol; i=rEndCol shrink; i++)
if (aCol[i].HasDataAt(rStartRow))
shrink = false;
if (shrink)
@@ -846,7 +848,7 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW
rStartRow, SCCOL rEndCol, S
bool shrink = true;
do
{
-for (i=rStartCol; i=rEndCol shrink; i++)
+for ( SCCOL i = rStartCol; i=rEndCol shrink; i++)
if (aCol[i].HasDataAt(rEndRow))
shrink = false;
if (shrink)
commit 2e5023f974dd94dfeec0554ce07d0544f9ce7638
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Mon Nov 28 10:10:15 2011 +0100
if empty row / col leads to shrink area, suppress all empty rows/col
and not just the last one, leaving the other within the selection
area
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 2262eca..3c142c1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -817,22 +817,25 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW
rStartRow, SCCOL rEndCol, S
if ( !bIncludeOld !bOnlyDown )
{
-if ( !bLeft rStartCol MAXCOL rStartCol rEndCol )
-if ( aCol[rStartCol].IsEmptyBlock(rStartRow,rEndRow) )
+if ( !bLeft )
+while ( aCol[rStartCol].IsEmptyBlock(rStartRow,rEndRow)
rStartCol MAXCOL rStartCol rEndCol)
++rStartCol;
-if (
[Libreoffice-commits] .: 4 commits - starmath/inc starmath/source
starmath/inc/view.hxx |1
starmath/source/cursor.cxx | 23 +++---
starmath/source/view.cxx | 47 ++---
3 files changed, 41 insertions(+), 30 deletions(-)
New commits:
commit 68c1f757962a8f2789821ff636bc397d1edd0051
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Dec 4 15:11:23 2011 +0400
visual formula editor: implement selection by mouse
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index d716e72..5781e26 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -103,6 +103,7 @@ public:
// Window
virtual voidMouseButtonDown(const MouseEvent rMEvt);
+virtual voidMouseMove(const MouseEvent rMEvt);
virtual voidGetFocus();
virtual voidLoseFocus();
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c9a0ffd..4dbc8a8 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -182,9 +182,7 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent
rMEvt)
return;
if (IsInlineEditEnabled()) {
-// if it was clicked inside the formula then get the appropriate
node
-if (pTree-OrientedDist(aPos) = 0)
-pViewShell-GetDoc()-GetCursor().MoveTo(this, aPos,
!rMEvt.IsShift());
+pViewShell-GetDoc()-GetCursor().MoveTo(this, aPos,
!rMEvt.IsShift());
return;
}
const SmNode *pNode = 0;
@@ -214,6 +212,22 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent
rMEvt)
}
}
+void SmGraphicWindow::MouseMove(const MouseEvent rMEvt)
+{
+ScrollableWindow::MouseMove(rMEvt);
+
+if (rMEvt.IsLeft() IsInlineEditEnabled())
+{
+Point aPos(PixelToLogic(rMEvt.GetPosPixel()) - GetFormulaDrawPos());
+pViewShell-GetDoc()-GetCursor().MoveTo(this, aPos, false);
+
+CaretBlinkStop();
+SetIsCursorVisible(true);
+CaretBlinkStart();
+RepaintViewShellDoc();
+}
+}
+
bool SmGraphicWindow::IsInlineEditEnabled() const
{
return pViewShell-IsInlineEditEnabled();
commit 558b5ea32a99654dcb63526f107726f7aec4747f
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Dec 4 15:05:46 2011 +0400
visual formula editor: copy/cut/paste for any keyboard layout
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 66626a0..c9a0ffd 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -421,8 +421,17 @@ void SmGraphicWindow::KeyInput(const KeyEvent rKEvt)
ScrollableWindow::KeyInput(rKEvt);
return;
}
-sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
+
SmCursor rCursor = pViewShell-GetDoc()-GetCursor();
+KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
+if (eFunc == KEYFUNC_COPY)
+rCursor.Copy();
+else if (eFunc == KEYFUNC_CUT)
+rCursor.Cut();
+else if (eFunc == KEYFUNC_PASTE)
+rCursor.Paste();
+else {
+sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
switch(nCode)
{
case KEY_LEFT:
@@ -491,15 +500,6 @@ void SmGraphicWindow::KeyInput(const KeyEvent rKEvt)
case KEY_EQUAL:
rCursor.InsertElement(EqualElement);
break;
-case KEY_COPY:
-rCursor.Copy();
-break;
-case KEY_CUT:
-rCursor.Cut();
-break;
-case KEY_PASTE:
-rCursor.Paste();
-break;
default:
{
sal_Unicode code = rKEvt.GetCharCode();
@@ -507,12 +507,6 @@ void SmGraphicWindow::KeyInput(const KeyEvent rKEvt)
if(code == ' ') {
rCursor.InsertElement(BlankElement);
-}else if(code == 'c' rKEvt.GetKeyCode().IsMod1()) {
-rCursor.Copy();
-}else if(code == 'x' rKEvt.GetKeyCode().IsMod1()) {
-rCursor.Cut();
-}else if(code == 'v' rKEvt.GetKeyCode().IsMod1()) {
-rCursor.Paste();
}else if(code == '^') {
rCursor.InsertSubSup(RSUP);
}else if(code == '(') {
@@ -539,6 +533,7 @@ void SmGraphicWindow::KeyInput(const KeyEvent rKEvt)
}
}
}
+}
CaretBlinkStop();
CaretBlinkStart();
SetIsCursorVisible(true);
commit 5a227745095d3a700ca01e062264aa5afd080c8a
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Dec 2 22:07:34 2011 +0400
visual formula editor: place cursor on numerator when creating empty
fraction
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index b7f518f..c2d7f4f 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -977,7 +977,8 @@ void SmCursor::InsertFraction() {
PatchLineList(pLineList, it);
//Finish editing
-FinishEdit(pLineList, pLineParent, nParentIndex, SmCaretPos(pDenom, 1));
+SmNode *pSelectedNode = bEmptyFraction ? pNum : pDenom;
+FinishEdit(pLineList, pLineParent,
[Libreoffice-commits] .: basctl/uiconfig officecfg/registry
basctl/uiconfig/basicide/menubar/menubar.xml |2 +- officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6ddc99b1dd4d64842ed7fca35b991b8cde8a724c Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Sun Dec 4 15:31:25 2011 +0100 String change for Line Number functionality in Basic IDE diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 24322b8..15d4fcd 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -48,8 +48,8 @@ menu:menuitem menu:id=.uno:AvailableToolbars/ menu:menuitem menu:id=.uno:StatusBarVisible/ menu:menuitem menu:id=.uno:ShowImeStatusWindow/ -menu:menuitem menu:id=.uno:GotoLine/ menu:menuitem menu:id=.uno:ShowLines/ +menu:menuitem menu:id=.uno:GotoLine/ menu:menuseparator/ menu:menuitem menu:id=.uno:FullScreen/ /menu:menupopup diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu index 84e5c41..47c7b35 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu @@ -10,7 +10,7 @@ /node node oor:name=.uno:ShowLines oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USDisplay Source Line Number/value + value xml:lang=en-USLine Numbers/value /prop /node ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/comp/scanner.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cc744ef568fed0529da133a9d97e1dec19daab10
Author: August Sodora aug...@gmail.com
Date: Sun Dec 4 17:29:16 2011 -0500
Use sal_uInt16 here
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 3b57781..dabeffe 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -152,7 +152,7 @@ static SbxDataType GetSuffixType( sal_Unicode c )
void SbiScanner::scanGoto()
{
-short nTestCol = nCol;
+sal_uInt16 nTestCol = nCol;
while(nTestCol aLine.getLength()
theBasicCharClass::get().isWhitespace(aLine[nTestCol]))
nTestCol++;
@@ -162,7 +162,7 @@ void SbiScanner::scanGoto()
if(aTestSym.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(to)))
{
aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(goto));
-pLine += (nTestCol - nCol) + 2;
+pLine += nTestCol + 2 - nCol;
nCol = nTestCol + 2;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/comp/scanner.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0bcc6c93b8dbd92f7f13ea40c464636b00be0d6f
Author: August Sodora aug...@gmail.com
Date: Sun Dec 4 18:08:28 2011 -0500
Use appropriate datatypes here too
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index dabeffe..cc17fd5 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -240,7 +240,7 @@ bool SbiScanner::NextSym()
{ pLine++;
goto eoln; }
bSymbol = true;
-short n = nCol;
+sal_uInt16 n = nCol;
for ( ; (theBasicCharClass::get().isAlphaNumeric( *pLine, bCompatible
) || ( *pLine == '_' ) ); pLine++ )
nCol++;
aSym = aLine.copy( n, nCol - n );
@@ -424,7 +424,7 @@ bool SbiScanner::NextSym()
sal_Unicode cSep = *pLine;
if( cSep == '[' )
bSymbol = true, cSep = ']';
-short n = nCol+1;
+sal_uInt16 n = nCol + 1;
while( *pLine )
{
do pLine++, nCol++;
@@ -460,7 +460,7 @@ bool SbiScanner::NextSym()
// other groups:
else
{
-short n = 1;
+sal_uInt8 n = 1;
switch( *pLine++ )
{
case '': if( *pLine == '' || *pLine == '=' ) n = 2; break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 402db3dceb02134860cf42af791523e7703c34dd Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Dec 5 00:09:50 2011 +0100 PostgreSQL-SDBC: increment version number diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 615b26b..aa168b0 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -74,7 +74,7 @@ DLLPRE= PQ_SDBC_MAJOR=0 PQ_SDBC_MINOR=8 -PQ_SDBC_MICRO=1 +PQ_SDBC_MICRO=2 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO) CFLAGS+=$(POSTGRESQL_INC) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/inc/bastypes.hxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 71de946a1a2f5479667abd0e8cd0446b1db3ee96
Author: August Sodora aug...@gmail.com
Date: Sun Dec 4 18:55:49 2011 -0500
sal_Bool to bool
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 25b276a..8684fe5 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -53,14 +53,16 @@ sal_Int32 searchEOL( const ::rtl::OUString rStr, sal_Int32
fromIndex );
struct BasicStatus
{
-sal_BoolbIsRunning : 1;
-sal_BoolbError : 1;
-sal_BoolbIsInReschedule : 1;
-sal_uInt16 nBasicFlags;
-
-BasicStatus() {
-bIsRunning = sal_False; bError = sal_False;
-nBasicFlags = 0; bIsInReschedule = sal_False; }
+bool bIsRunning : 1;
+bool bError : 1;
+bool bIsInReschedule : 1;
+sal_uInt16 nBasicFlags;
+
+BasicStatus():
+bIsRunning(false),
+bError(false),
+bIsInReschedule(false),
+nBasicFlags(0) { }
};
struct BreakPoint
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - sc/CppunitTest_sc_cellrangesbase.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_xcellrangesquery.mk sc/Module_sc.mk sc/qa sc/source
sc/CppunitTest_sc_cellrangesbase.mk | 142 ++
sc/CppunitTest_sc_tableautoformatfield.mk | 141 +
sc/CppunitTest_sc_xcellrangesquery.mk | 141 -
sc/Module_sc.mk |3
sc/qa/extras/cellproperties.cxx | 117
sc/qa/extras/tableautoformatfield.cxx | 107 ++
sc/qa/extras/xcellrangesquery.cxx |2
sc/source/filter/xml/xmlcelli.cxx |2
sc/source/ui/namedlg/namedefdlg.cxx |4
sc/source/ui/namedlg/namedlg.cxx | 25 +++--
sc/source/ui/src/namedlg.src |4
11 files changed, 532 insertions(+), 156 deletions(-)
New commits:
commit 9d5d04776f0a163796a41446852ec59ba76c9c1a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 5 00:53:14 2011 +0100
add subsequenttest for failing test CellProperties
share test between all services which share the implementation in
ScCellRangesBase
diff --git a/sc/CppunitTest_sc_cellrangesbase.mk
b/sc/CppunitTest_sc_cellrangesbase.mk
index 2c1063f..98d1683 100644
--- a/sc/CppunitTest_sc_cellrangesbase.mk
+++ b/sc/CppunitTest_sc_cellrangesbase.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_cellrangesbase))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangesbase, \
sc/qa/extras/xcellrangesquery \
+sc/qa/extras/cellproperties \
))
$(eval $(call gb_CppunitTest_add_linked_libs,sc_cellrangesbase, \
diff --git a/sc/qa/extras/cellproperties.cxx b/sc/qa/extras/cellproperties.cxx
new file mode 100644
index 000..20e90f4
--- /dev/null
+++ b/sc/qa/extras/cellproperties.cxx
@@ -0,0 +1,117 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Markus Mohrhard markus.mohrh...@googlemail.com
(initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include test/unoapi_test.hxx
+
+#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/table/CellVertJustify.hpp
+#include com/sun/star/sheet/XSpreadsheetDocument.hpp
+#include com/sun/star/sheet/XSpreadsheet.hpp
+#include com/sun/star/table/XCellRange.hpp
+
+namespace ScCellRangeBase {
+
+class ScCellProperties : public UnoApiTest
+{
+uno::Reference beans::XPropertySet init();
+
+void testVertJustify();
+void testRotateReference();
+CPPUNIT_TEST_SUITE(ScCellProperties);
+//enable as soon as fixed
+//CPPUNIT_TEST(testVertJustify);
+//CPPUNIT_TEST(testRotateReference);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void ScCellProperties::testVertJustify()
+{
+uno::Reference beans::XPropertySet xCellRangeBase = init();
+rtl::OUString aVertJustify(RTL_CONSTASCII_USTRINGPARAM(VertJustify));
+uno::Any aOldVertJustify = xCellRangeBase-getPropertyValue(aVertJustify);
+sal_Int32 aValue;
+CPPUNIT_ASSERT(aOldVertJustify = aValue);
+std::cout Old VertJustify value: aValue std::endl;
+
+uno::Any aNewVertJustify;
+aNewVertJustify = table::CellVertJustify_BOTTOM;
+xCellRangeBase-setPropertyValue(aVertJustify, aNewVertJustify);
+uno::Any aVertJustifyControllValue =
xCellRangeBase-getPropertyValue(aVertJustify);
+CPPUNIT_ASSERT(aVertJustifyControllValue = aValue);
+std::cout New VertJustify value: aValue std::endl;
+CPPUNIT_ASSERT_MESSAGE(value has not been changed, aValue ==
table::CellVertJustify_BOTTOM);
+}
+
+void ScCellProperties::testRotateReference()
+{
+uno::Reference beans::XPropertySet xCellRangeBase = init();
+rtl::OUString
aRotateReference(RTL_CONSTASCII_USTRINGPARAM(RotateReference));
+uno::Any aOldRotateReference =
xCellRangeBase-getPropertyValue(aRotateReference);
+sal_Int32 aValue;
+CPPUNIT_ASSERT(aOldRotateReference = aValue);
+std::cout Old RotateReference Value: aValue std::endl;
+
+uno::Any aNewRotateReference;
+aNewRotateReference =
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/dbadmin.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a9271b8fc70f263d1d7ffb8caae915447c32228
Author: Lior Kaplan kaplanl...@gmail.com
Date: Mon Dec 5 03:11:19 2011 +0200
Add missing space
diff --git a/dbaccess/source/ui/dlg/dbadmin.src
b/dbaccess/source/ui/dlg/dbadmin.src
index d3a356f..8bacdec 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -692,7 +692,7 @@ TabPage PAGE_LDAP
{
Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS +
2*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_X - 12 , CHECKBOX_HEIGHT ) ;
-Text [ en-US ] = Use secure connection(SSL);
+Text [ en-US ] = Use secure connection (SSL);
HelpId = HID_DSADMIN_USESSL_LDAP;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basctl/Library_basctl.mk basctl/source
basctl/Library_basctl.mk |1
basctl/source/basicide/baside2.hxx|1
basctl/source/basicide/baside2b.cxx |2
basctl/source/basicide/basidesh.cxx |4
basctl/source/basicide/bastypes.cxx | 125 ---
basctl/source/basicide/breakpoint.cxx | 179 ++
basctl/source/basicide/breakpoint.hxx | 79 +++
basctl/source/basicide/brkdlg.cxx | 15 +-
basctl/source/inc/bastypes.hxx| 73 +
9 files changed, 279 insertions(+), 200 deletions(-)
New commits:
commit f81a7438409ee9cede09b0395d8af0943220a4ea
Author: August Sodora aug...@gmail.com
Date: Sun Dec 4 22:01:35 2011 -0500
Refactor BreakPoint
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 45403ec..438c8c3 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/bastype2 \
basctl/source/basicide/bastype3 \
basctl/source/basicide/bastypes \
+ basctl/source/basicide/breakpoint \
basctl/source/basicide/brkdlg \
basctl/source/basicide/doceventnotifier \
basctl/source/basicide/docsignature \
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 119aa60..e9378ab 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -51,6 +51,7 @@ class SvxSearchItem;
#include sfx2/progress.hxx
#include svtools/syntaxhighlight.hxx
+#include breakpoint.hxx
#include linenumberwindow.hxx
DBG_NAMEEX( ModulWindow )
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 4ad4eea..dfef385 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -26,14 +26,12 @@
*
/
-
#define _BASIC_TEXTPORTIONS
#include helpid.hrc
#include baside2.hrc
#include baside2.hxx
-#include basobj.hxx
#include brkdlg.hxx
#include iderdll.hxx
#include iderdll2.hxx
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 2ced841..21dfce9 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -252,127 +252,6 @@ Window* IDEBaseWindow::GetLayoutWindow()
return NULL;
}
-BreakPointList::BreakPointList()
-{}
-
-BreakPointList::BreakPointList(BreakPointList const rList)
-{
-for (size_t i = 0; i rList.size(); ++i)
-maBreakPoints.push_back( new BreakPoint(*rList.at( i ) ) );
-}
-
-BreakPointList::~BreakPointList()
-{
-reset();
-}
-
-void BreakPointList::reset()
-{
-for ( size_t i = 0, n = maBreakPoints.size(); i n; ++i )
-delete maBreakPoints[ i ];
-maBreakPoints.clear();
-}
-
-void BreakPointList::transfer(BreakPointList rList)
-{
-reset();
-for (size_t i = 0; i rList.size(); ++i)
-maBreakPoints.push_back( rList.at( i ) );
-rList.clear();
-}
-
-void BreakPointList::InsertSorted( BreakPoint* pNewBrk )
-{
-for ( vector BreakPoint* ::iterator i = maBreakPoints.begin(); i
maBreakPoints.end(); ++i )
-{
-if ( pNewBrk-nLine = (*i)-nLine )
-{
-DBG_ASSERT( ( (*i)-nLine != pNewBrk-nLine ) || pNewBrk-bTemp,
BreakPoint existiert schon! );
-maBreakPoints.insert( i, pNewBrk );
-return;
-}
-}
-// no insert position found = LIST_APPEND
-maBreakPoints.push_back( pNewBrk );
-}
-
-void BreakPointList::SetBreakPointsInBasic( SbModule* pModule )
-{
-pModule-ClearAllBP();
-
-for ( size_t i = 0, n = maBreakPoints.size(); i n; ++i )
-{
-BreakPoint* pBrk = maBreakPoints[ i ];
-if ( pBrk-bEnabled )
-pModule-SetBP( (sal_uInt16)pBrk-nLine );
-}
-}
-
-BreakPoint* BreakPointList::FindBreakPoint( size_t nLine )
-{
-for ( size_t i = 0, n = maBreakPoints.size(); i n; ++i )
-{
-BreakPoint* pBrk = maBreakPoints[ i ];
-if ( pBrk-nLine == nLine )
-return pBrk;
-}
-return NULL;
-}
-
-void BreakPointList::AdjustBreakPoints( size_t nLine, bool bInserted )
-{
-for ( size_t i = 0; i maBreakPoints.size(); )
-{
-BreakPoint* pBrk = maBreakPoints[ i ];
-bool bDelBrk = false;
-if ( pBrk-nLine == nLine )
-{
-if ( bInserted )
-pBrk-nLine++;
-else
-bDelBrk = true;
-}
-else if ( pBrk-nLine nLine )
-{
-if ( bInserted )
-pBrk-nLine++;
-else
-pBrk-nLine--;
-}
-
-if ( bDelBrk )
-{
-delete remove( pBrk );
-}
-else
-{
-++i;
-}
-}
-}
-
-void BreakPointList::ResetHitCount()
-{
-for ( size_t i = 0, n = maBreakPoints.size(); i n; ++i )
-{
-
[Libreoffice-commits] .: basic/source
basic/source/comp/scanner.cxx | 17 +
basic/source/inc/scanner.hxx |1 +
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 40be618fb31754611dbd4241322004b205774976
Author: August Sodora aug...@gmail.com
Date: Sun Dec 4 22:13:24 2011 -0500
Refactor scanAlphanumeric
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index cc17fd5..4b4ba23 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -150,6 +150,17 @@ static SbxDataType GetSuffixType( sal_Unicode c )
// return value is sal_False at EOF or errors
#define BUF_SIZE 80
+void SbiScanner::scanAlphanumeric()
+{
+sal_uInt16 n = nCol;
+while(theBasicCharClass::get().isAlphaNumeric(*pLine, bCompatible) ||
*pLine == '_')
+{
+pLine++;
+nCol++;
+}
+aSym = aLine.copy(n, nCol - n);
+}
+
void SbiScanner::scanGoto()
{
sal_uInt16 nTestCol = nCol;
@@ -240,10 +251,8 @@ bool SbiScanner::NextSym()
{ pLine++;
goto eoln; }
bSymbol = true;
-sal_uInt16 n = nCol;
-for ( ; (theBasicCharClass::get().isAlphaNumeric( *pLine, bCompatible
) || ( *pLine == '_' ) ); pLine++ )
-nCol++;
-aSym = aLine.copy( n, nCol - n );
+
+scanAlphanumeric();
// Special handling for go to
if( bCompatible *pLine aSym.equalsIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(go) ) )
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index c254cf2..abda26b 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -46,6 +46,7 @@ class SbiScanner
const sal_Unicode* pLine;
const sal_Unicode* pSaveLine;
+void scanAlphanumeric();
void scanGoto();
protected:
::rtl::OUString aSym;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/breakpoint.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit aa948e1c25dfa07f6bc47d1077a74ec61982b9c4 Author: Ivan Timofeev timofeev@gmail.com Date: Mon Dec 5 08:31:45 2011 +0400 add missing include for size_t diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 16cdfa3..a989144 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -28,6 +28,7 @@ #ifndef _BREAKPOINT_HXX #define _BREAKPOINT_HXX +#include cstddef #include vector class SbModule; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basctl/source
basctl/source/basicide/baside2.cxx| 20 +++-
basctl/source/basicide/breakpoint.cxx |2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit ebf168f59f64b868002c10a49448e02939074755
Author: August Sodora aug...@gmail.com
Date: Mon Dec 5 00:52:02 2011 -0500
So size_t is recognized on windows
diff --git a/basctl/source/basicide/breakpoint.cxx
b/basctl/source/basicide/breakpoint.cxx
index b763174..6bbfdf9 100644
--- a/basctl/source/basicide/breakpoint.cxx
+++ b/basctl/source/basicide/breakpoint.cxx
@@ -31,6 +31,8 @@
#include basic/sbmod.hxx
#include tools/debug.hxx
+#include stddef.h
+
BreakPointList::BreakPointList()
{}
commit 5ca762a9caf9b89f225d2c8ddd32d265d4bddb61
Author: August Sodora aug...@gmail.com
Date: Mon Dec 5 00:47:35 2011 -0500
String-OUString
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 0f425cf..ddb3781 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -82,7 +82,7 @@ DBG_NAME( ModulWindow )
TYPEINIT1( ModulWindow , IDEBaseWindow );
-void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16
nCurPage, const String rTitle, bool bOutput )
+void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16
nCurPage, const ::rtl::OUString rTitle, bool bOutput )
{
short nLeftMargin = LMARGPRN;
Size aSz = pPrinter-GetOutputSize();
@@ -122,17 +122,20 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16
nPages, sal_uInt16 nCurPage,
{
aFont.SetWeight( WEIGHT_NORMAL );
pPrinter-SetFont( aFont );
-String aPageStr( RTL_CONSTASCII_USTRINGPARAM( [ ) );
-aPageStr += String( IDEResId( RID_STR_PAGE ) );
-aPageStr += ' ';
-aPageStr += String::CreateFromInt32( nCurPage );
-aPageStr += ']';
aPos.X() += pPrinter-GetTextWidth( rTitle );
+
if( bOutput )
-pPrinter-DrawText( aPos, aPageStr );
+{
+::rtl::OUStringBuffer aPageStr;
+aPageStr.appendAscii( RTL_CONSTASCII_STRINGPARAM( [ ) );
+aPageStr.append(ResId::toString( IDEResId( RID_STR_PAGE ) ));
+aPageStr.append(' ');
+aPageStr.append( nCurPage );
+aPageStr.append(']');
+pPrinter-DrawText( aPos, aPageStr.makeStringAndClear() );
+}
}
-
nY = TMARGPRN-nBorder;
if( bOutput )
@@ -165,7 +168,6 @@ void lcl_ConvertTabsToSpaces( String rLine )
}
}
-
ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument
rDocument, String aLibName,
String aName, ::rtl::OUString aModule )
:IDEBaseWindow( pParent, rDocument, aLibName, aName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 04f53f0714ed364177a740d9de52c497cda74064 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Dec 5 07:46:59 2011 +0100 configure.in: search for pg_config in default fink/MacPort locations diff --git a/configure.in b/configure.in index 5b2a01c..cf0d3cb 100644 --- a/configure.in +++ b/configure.in @@ -5409,7 +5409,7 @@ if test x$enable_ext_postgresql_sdbc = xyes -a x$enable_extension_integrati SYSTEM_POSTGRESQL=YES if test $_os = Darwin; then supp_path='' - for d in /Library/PostgreSQL/9.*/bin; do + for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin /opt/local/lib/postgresql9*/bin; do pg_supp_path=$PATH_SEPARATOR$d$pg_supp_path done fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/process.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 90a3c0c0b46123a3647a53ddc942ba8614edb722
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 5 08:27:20 2011 +0100
ChildStatusProc needs to be extern C.
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index c35a340..57bc717 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -434,6 +434,8 @@ oslSocket osl_receiveResourcePipe(oslPipe pPipe)
*
*/
+extern C {
+
static void ChildStatusProc(void *pData)
{
pid_t pid = -1;
@@ -703,6 +705,8 @@ static void ChildStatusProc(void *pData)
}
}
+}
+
/**
osl_executeProcess_WithRedirectedIO
*/
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_GCC.mk |8 solenv/gbuild/platform/WNT_INTEL_MSC.mk |8 2 files changed, 8 insertions(+), 8 deletions(-) New commits: commit a35140f245d774745b806ef12346aa77f0256395 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Dec 2 11:41:33 2011 +0200 Fix library layer mapping for the URELIB ones, fdo#42826 diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index ae99f11..78ce3bd 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -292,13 +292,13 @@ gb_Library_PLAINLIBS_NONE += \ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 7a56245..5f8fb1c 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -432,13 +432,13 @@ gb_Library_PLAINLIBS_NONE += \ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
