[Libreoffice-commits] .: svx/source sw/source
svx/source/tbxctrls/tbcontrl.cxx | 12
svx/source/tbxctrls/tbxcolorupdate.cxx | 16 ++--
sw/source/ui/docvw/edtwin.cxx |8
3 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit ae7c80640df922630060b82ffa91fd7db2e4d6d7
Author: Winfried Donkers o...@dci-electronics.nl
Date: Sun Mar 11 09:05:02 2012 +0100
fdo#45671 set initial color for split buttons
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0ecf87d..cb56fac 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2231,6 +2231,14 @@ void SvxColorToolBoxControl::StateChanged(
//
// class SvxColorExtToolBoxControl
//
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+ */
SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
sal_uInt16 nSlotId,
@@ -2252,11 +2260,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
case SID_ATTR_CHAR_COLOR:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:Color )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_RED;
break;
case SID_ATTR_CHAR_COLOR2:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharColorExt )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_RED;
break;
case SID_BACKGROUND_COLOR:
@@ -2264,11 +2274,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
default:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharBackgroundExt )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_YELLOW;
break;
case SID_FRAME_LINECOLOR:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:FrameLineColor )));
nMode = 0;
+mLastColor = COL_BLUE;
break;
}
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 1b567d4..c62ce1b 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -44,6 +44,14 @@ namespace svx
//
//= ToolboxButtonColorUpdater
//
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+ */
ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
sal_uInt16 nId,
@@ -64,13 +72,17 @@ namespace svx
{
case SID_ATTR_CHAR_COLOR :
case SID_ATTR_CHAR_COLOR2 :
-Update( COL_BLACK );
+Update( COL_RED );
+break;
+case SID_FRAME_LINECOLOR :
+Update( COL_BLUE );
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND :
+case SID_BACKGROUND_COLOR :
Update( COL_YELLOW );
break;
default :
-Update( COL_GRAY );
+Update( COL_TRANSPARENT );
}
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index bb2daba..5aabb08 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -176,6 +176,14 @@ QuickHelpData* SwEditWin::pQuickHlpData = 0;
longSwEditWin::nDDStartPosY = 0;
longSwEditWin::nDDStartPosX = 0;
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+
[Libreoffice-commits] .: 3 commits - basegfx/source build_env comphelper/inc comphelper/source cppuhelper/source
basegfx/source/tools/zoomtools.cxx | 10 --
build_env | 11 +++
comphelper/inc/comphelper/oslfile2streamwrap.hxx|4 ++--
comphelper/source/container/container.cxx |6 +++---
comphelper/source/eventattachermgr/eventattachermgr.cxx |6 +++---
comphelper/source/property/propagg.cxx |2 +-
cppuhelper/source/propshlp.cxx |4 ++--
7 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 5bec57a0b784a3bc8a181705f04f7af53ca4e04b
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Mar 10 21:58:25 2012 +0100
Correct some mistranslated comments
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index 64ebca6..f43297b 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -42,7 +42,7 @@ namespace comphelper
//==
// FmUnoIOStream,
-// Stream to read and write from data read from a file
+// Stream to read and write data, based on File
//==
class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public
::cppu::WeakImplHelper1stario::XInputStream
{
@@ -63,7 +63,7 @@ public:
//==
// FmUnoOutStream,
-// sync data for the files
+// data sink for the files
//==
class OSLOutputStreamWrapper : public
::cppu::WeakImplHelper1stario::XOutputStream
{
diff --git a/comphelper/source/container/container.cxx
b/comphelper/source/container/container.cxx
index d3012c2..5274059 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.cxx
@@ -91,18 +91,18 @@ IndexAccessIterator::~IndexAccessIterator() {}
xContainerAccess = ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess(xParent,
::com::sun::star::uno::UNO_QUERY);
OSL_ENSURE(xContainerAccess.is(),
IndexAccessIterator::Next : a content has an invalid parent !);
-// Update the search loop index
+// Remove the index that SearchLoop had within this parent
from my stack
sal_Int32 nOldSearchChildIndex =
m_arrChildIndizies[m_arrChildIndizies.size() - 1];
m_arrChildIndizies.pop_back();
if (nOldSearchChildIndex xContainerAccess-getCount() -
1)
{ // Move to the right in this row
++nOldSearchChildIndex;
-// and check the nex child
+// and check the next child
::com::sun::star::uno::Any
aElement(xContainerAccess-getByIndex(nOldSearchChildIndex));
xSearchLoop = *(::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface*) aElement.getValue();
bCheckingStartingPoint = sal_False;
-// and update is position in the list.
+// and update its position in the list.
m_arrChildIndizies.push_back((sal_Int32)nOldSearchChildIndex);
break;
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx
b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 70a8ad8..b72cd2c 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -789,7 +789,7 @@ void SAL_CALL ImplEventAttacherManager::write(const
Reference XObjectOutputStre
// Write out the version
OutStream-writeShort( 2 );
-// Position the position for length
+// Remember position for length
sal_Int32 nObjLenMark = xMarkStream-createMark();
OutStream-writeLong( 0L );
@@ -838,8 +838,8 @@ void SAL_CALL ImplEventAttacherManager::read(const
Reference XObjectInputStream
// Read in the version
nVersion = InStream-readShort();
-// Next is the time since version 1.
-// Should this be deprecated in later versions?
+// At first there's the data according to version 1 --
+// this part needs to be kept in later versions.
sal_Int32 nLen = InStream-readLong();
// Position for comparative purposes
diff --git a/comphelper/source/property/propagg.cxx
b/comphelper/source/property/propagg.cxx
index e186582..22305d4 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -301,7 +301,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
n = n 1;
}
-// Number of the searched properties * the Log2 of the reamining
properties
+// (Number
[Libreoffice-commits] .: 2 commits - connectivity/source sw/source
,// Parent page
+aChild; // Pointer to the right child page
ODbaseIndex rIndex;
-ONDXNode* ppNodes; // array von Knoten
+ONDXNode* ppNodes; // Array of nodes
public:
-// Knoten Operationen
+// Node operations
sal_uInt16 Count() const {return nCount;}
sal_BoolInsert(ONDXNode rNode, sal_uInt32 nRowsLeft = 0);
@@ -146,11 +146,11 @@ namespace connectivity
voidRelease(sal_Bool bSave = sal_True);
voidReleaseFull(sal_Bool bSave = sal_True);
-// Aufteilen und Zerlegen
+// Split and merge
ONDXNode Split(ONDXPage rPage);
void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
-// Zugriffsoperationen
+// Access operators
ONDXNode operator[] (sal_uInt16 nPos);
const ONDXNode operator[] (sal_uInt16 nPos) const;
@@ -165,12 +165,12 @@ namespace connectivity
sal_uInt32 GetPagePos() const {return nPagePos;}
ONDXPagePtr GetChild(ODbaseIndex* pIndex = 0);
-// Parent braucht nicht nachgeladen zu werden
+// Parent does not need to be reloaded
ONDXPagePtr GetParent();
ODbaseIndex GetIndex() {return rIndex;}
const ODbaseIndex GetIndex() const {return rIndex;}
-// Setzen des Childs, ueber Referenz, um die PagePos zu erhalten
+// Setting the child, via reference to retain the PagePos
void SetChild(ONDXPagePtr aCh);
void SetParent(ONDXPagePtr aPa);
@@ -187,7 +187,7 @@ namespace connectivity
void SetModified(sal_Bool bMod) {bModified = bMod;}
void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
-sal_Bool Find(const ONDXKey); // rek. Abstieg
+sal_Bool Find(const ONDXKey); // Descend recursively
sal_uInt16 FindPos(const ONDXKey rKey) const;
#if OSL_DEBUG_LEVEL 1
@@ -225,12 +225,12 @@ namespace connectivity
typedef ::std::vectorONDXPage*ONDXPageList;
//==
-// Index Knoten
+// Index Node
//==
class ONDXNode
{
friend class ONDXPage;
-ONDXPagePtr aChild; /* naechster Seitenverweis */
+ONDXPagePtr aChild; /* Next page reference */
ONDXKey aKey;
public:
@@ -239,15 +239,15 @@ namespace connectivity
ONDXPagePtr aPagePtr = ONDXPagePtr())
:aChild(aPagePtr),aKey(rKey) {}
-// verweist der Knoten auf eine Seite
+// Does the node point to a page?
sal_BoolHasChild() const {return aChild.HasPage();}
-// Ist ein Index angegeben, kann gegebenfalls die Seite
nachgeladen werden
+// If an index is provided, we may be able to retrieve the page
ONDXPagePtrGetChild(ODbaseIndex* pIndex = NULL, ONDXPage* =
NULL);
const ONDXKey GetKey() const { return aKey;}
ONDXKey GetKey() { return aKey;}
-// Setzen des Childs, ueber Referenz, um die PagePos zu erhalten
+// Setting the child, via reference to retain the PagePos
voidSetChild(ONDXPagePtr aCh = ONDXPagePtr(),
ONDXPage* = NULL);
voidSetKey(ONDXKey rKey) {aKey = rKey;}
commit bacf45b72258271f8ff96a371688b781d9c0ba37
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Feb 25 11:56:19 2012 +0100
Writer/Options: Move Comments 10 units up
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index e02d415..347bd8b 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -171,7 +171,7 @@ TabPage TP_CONTENT_OPT
CheckBox CB_POSTIT
{
HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT;
-Pos = MAP_APPFONT ( 12 , 103 ) ;
+Pos = MAP_APPFONT ( 12 , 93 ) ;
Size = MAP_APPFONT ( 108 , 10 ) ;
Text [ en-US ] = ~Comments ;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/namedlg/namedefdlg.cxx |2 -
sc/source/ui/src/namedefdlg.src | 54 ++--
sc/source/ui/src/namedlg.src| 48
3 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 0b6486772c52d7112e76555fca6525ad2eec2bae
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Jan 28 19:52:04 2012 +0100
Make named range dialog more consistent, localizable (II)
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 1fad2a6..4b98947 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -346,7 +346,7 @@ void ScNameDefDlg::MorePushed()
Size nSize = GetSizePixel();
//depending on the state of the button, move all elements below up/down
-long nPixel = 75;
+long nPixel = 65;
if (!maBtnMore.GetState())
{
nPixel *= -1;
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 42538dd..65de9e5 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -34,117 +34,117 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
HelpId = CMD_FID_ADD_NAME ;
Hide = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 120 ) ;
+Size = MAP_APPFONT ( 200 , 116 ) ;
Text [ en-US ] = Define Name ;
Moveable = TRUE ;
Closeable = TRUE;
PushButton BTN_ADD
{
-Pos = MAP_APPFONT( 90, 100 );
+Pos = MAP_APPFONT( 90, 96 );
Size = MAP_APPFONT( 50, 15 );
TabStop = TRUE;
Text [en-US] = Add;
};
PushButton BTN_CANCEL
{
-Pos = MAP_APPFONT( 145, 100 );
+Pos = MAP_APPFONT( 145, 96 );
Size = MAP_APPFONT ( 50, 15 );
TabStop = TRUE;
Text [en-US] = Cancel;
};
CheckBox BTN_MORE
{
-Pos = MAP_APPFONT( 5, 82 );
+Pos = MAP_APPFONT( 5, 81 );
Size = MAP_APPFONT( 80, 15 );
Text [en-US] = Range Options;
};
FixedText FT_INFO
{
Pos = MAP_APPFONT( 5, 5 );
-Size = MAP_APPFONT( 180, 15 );
+Size = MAP_APPFONT( 190, 15 );
};
FixedText FT_NAME
{
-Pos = MAP_APPFONT( 5, 25 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 27 );
+Size = MAP_APPFONT( 40, 13 );
Text [en-US] = Name;
};
FixedText FT_RANGE
{
Pos = MAP_APPFONT( 5, 45 );
-Size = MAP_APPFONT( 30, 15 );
+Size = MAP_APPFONT( 40, 13 );
Text [en-US] = Range;
};
FixedText FT_SCOPE
{
-Pos = MAP_APPFONT( 5, 65 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 63 );
+Size = MAP_APPFONT( 40, 13 );
Text [en-US] = Scope;
};
Edit ED_NAME
{
Border = TRUE;
-Pos = MAP_APPFONT( 40, 25 );
-Size = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 50, 25 );
+Size = MAP_APPFONT( 145, 13 );
TabStop = TRUE;
};
Edit ED_RANGE
{
Border = TRUE;
-Pos = MAP_APPFONT( 40, 45 );
-Size = MAP_APPFONT( 140, 15 );
+Pos = MAP_APPFONT( 50, 43 );
+Size = MAP_APPFONT( 130, 13 );
TabStop = TRUE;
};
ImageButton RB_RANGE
{
-Pos = MAP_APPFONT ( 180 , 45 ) ;
-Size = MAP_APPFONT ( 15 , 15 ) ;
+Pos = MAP_APPFONT ( 180 , 43 ) ;
+Size = MAP_APPFONT ( 15 , 13 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = Shrink ;
};
CheckBox BTN_PRINTAREA
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA;
-Pos = MAP_APPFONT ( 5 , 100 ) ;
-Size = MAP_APPFONT ( 80 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 94 ) ;
+Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = ~Print range ;
TabStop = TRUE ;
};
CheckBox BTN_CRITERIA
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA;
-Pos = MAP_APPFONT ( 5 , 120 ) ;
-Size = MAP_APPFONT ( 60 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 107 ) ;
+Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = ~Filter ;
TabStop = TRUE ;
};
CheckBox BTN_ROWHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER;
-Pos = MAP_APPFONT ( 110, 120 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 110, 107 ) ;
+Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = Repeat ~row ;
TabStop = TRUE ;
};
CheckBox BTN_COLHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER;
-Pos = MAP_APPFONT ( 110 , 100 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 110 , 94 ) ;
+Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = Repeat ~column ;
TabStop = TRUE ;
};
ListBox LB_SCOPE
{
Border = TRUE;
-Pos
[Libreoffice-commits] .: sc/source
sc/source/ui/src/globstr.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e70541dc4627d63f294837f3eefc1cc25398b703
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Mon Jan 30 09:59:40 2012 +0100
Updated error message for Invalid sheet name
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index a5a1e6a..18e924b 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -687,7 +687,7 @@ Resource RID_GLOBSTR
};
String STR_INVALIDTABNAME
{
-Text [ en-US ] = Invalid sheet name. ;
+Text [ en-US ] = Invalid sheet name.\nThe sheet name must not be a
duplicate of an existing name \nand may not contain the characters [ ] * ? /
\\ ;
};
String STR_SCENARIO
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/src/namedlg.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f1cb0a4ab4f11dc015be1696c7c7751802171915
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Thu Jan 26 14:36:16 2012 +0100
Make named ranges dialog more consistent, localizable
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 6c1c46a..71bbc95 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -95,15 +95,15 @@ ModelessDialog RID_SCDLG_NAMES
Edit ED_NAME2
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 140 ) ;
-Size = MAP_APPFONT ( 168 , 12 ) ;
+Pos = MAP_APPFONT ( 60 , 140 ) ;
+Size = MAP_APPFONT ( 155 , 12 ) ;
TabStop = TRUE ;
};
ListBox LB_SCOPE
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 170 ) ;
-Size = MAP_APPFONT ( 168 , 80 ) ;
+Pos = MAP_APPFONT ( 60 , 170 ) ;
+Size = MAP_APPFONT ( 155 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
@@ -112,8 +112,8 @@ ModelessDialog RID_SCDLG_NAMES
{
HelpID = sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN;
Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 155 ) ;
-Size = MAP_APPFONT ( 152 , 12 ) ;
+Pos = MAP_APPFONT ( 60 , 155 ) ;
+Size = MAP_APPFONT ( 142 , 12 ) ;
TabStop = TRUE ;
};
ImageButton RB_ASSIGN
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
::ReplaceSdrObj( const String
rGrfName, const String rFltNam
StartAllAction();
StartUndo();
-// das Sdr-Object loeschen und dafuer die Grafik einfuegen
+// delete Sdr-Object, insert the graphic instead
DelSelectedObj();
pFmt = GetDoc()-Insert( *GetCrsr(), rGrfName, rFltName, pGrf,
aFrmSet, NULL, NULL );
commit df8dfbd6563e2d35bc4d8563d7ddaa779e4c2fe3
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Jan 14 14:05:10 2012 +0100
Remove a few left-over FIXME's from comment translations
See also: 5513e24eeaca20a12aac338a722fc9ba81c7c833
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1ba11b8..21194b1 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -390,7 +390,7 @@ SwDoc::SwDoc()
// Set to Empty Page
pEmptyPageFmt-SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
-// Set BodyFmt for Column Setting Spalten Einstellen. FIXME: WHAT?
+// Set BodyFmt for columns
pColumnContFmt-SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
_InitFieldTypes();
@@ -560,12 +560,12 @@ SwDoc::~SwDoc()
pSpzFrmFmtTbl-ForEach( lcl_DelFmtIndizes, this );
((SwFrmFmts)*pSectionFmtTbl).ForEach( lcl_DelFmtIndizes, this );
-// The Formats that come hereafter are depended on the
-// DefaultFormats.
-// FIXME: What?
-// FIXME: Erst nach dem Loeschen der FmtIndizes weil der Inhalt von
-// FIXME: Kopf-/Fussbereichen geloescht wird. Wenn dort noch Indizes von
Flys
-// FIXME: angemeldet sind gibts was an die Ohren.
+// The formattings that come hereafter depend on the default formattings.
+// [Destroy] these only after destroying the FmtIndices, because the
content
+// of headers/footers has to be deleted as well. If in the headers/footers
+// there are still Flys registered at that point, we have a problem.
+// (This comment might have been translated incorrectly. Blame the bad
+// German original)
aPageDescs.DeleteAndDestroy( 0, aPageDescs.Count() );
// Delete content selections.
@@ -627,7 +627,7 @@ SwDoc::~SwDoc()
DELETEZ( pLinkMgr );
// Clear the Tables before deleting them, or we crash due to
-// FIXME: Def-Abhängigen
+// definition dependencies.
// We also convert the arrays (due to includes) to pointers.
delete pFrmFmtTbl;
delete pSpzFrmFmtTbl;
@@ -727,7 +727,6 @@ void SwDoc::SetDocShell( SwDocShell* pDSh )
}
pLinkMgr-SetPersist( pDocShell );
-// Bug 55570 - Set the DocShell pointer also in the DrawModel
if( pDrawModel )
{
((SwDrawDocument*)pDrawModel)-SetObjectShell( pDocShell );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo_custom_images/tango
ooo_custom_images/tango/framework/res/addtemplate_32.png |binary ooo_custom_images/tango/framework/res/arrow.png |binary ooo_custom_images/tango/framework/res/extension.png |binary ooo_custom_images/tango/framework/res/folder_32.png |binary ooo_custom_images/tango/framework/res/info_26.svg| 148 +++ ooo_custom_images/tango/framework/res/templates_32.png |binary 6 files changed, 148 insertions(+) New commits: commit a76b594329ecae98c14662aac74f6a13882c4c41 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Thu Dec 15 11:29:14 2011 +0100 New Tango Start Center artwork By Alexander Wilms/Stefan Knorr (astron) diff --git a/ooo_custom_images/tango/framework/res/addtemplate_32.png b/ooo_custom_images/tango/framework/res/addtemplate_32.png new file mode 100644 index 000..6ac0ce2 Binary files /dev/null and b/ooo_custom_images/tango/framework/res/addtemplate_32.png differ diff --git a/ooo_custom_images/tango/framework/res/arrow.png b/ooo_custom_images/tango/framework/res/arrow.png new file mode 100644 index 000..8c817cc Binary files /dev/null and b/ooo_custom_images/tango/framework/res/arrow.png differ diff --git a/ooo_custom_images/tango/framework/res/extension.png b/ooo_custom_images/tango/framework/res/extension.png new file mode 100644 index 000..ee7cd39 Binary files /dev/null and b/ooo_custom_images/tango/framework/res/extension.png differ diff --git a/ooo_custom_images/tango/framework/res/folder_32.png b/ooo_custom_images/tango/framework/res/folder_32.png new file mode 100644 index 000..7d80314 Binary files /dev/null and b/ooo_custom_images/tango/framework/res/folder_32.png differ diff --git a/ooo_custom_images/tango/framework/res/info_26.svg b/ooo_custom_images/tango/framework/res/info_26.svg new file mode 100644 index 000..0b41cb5 --- /dev/null +++ b/ooo_custom_images/tango/framework/res/info_26.svg @@ -0,0 +1,148 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=24 + height=24 + id=svg6455 + version=1.1 + inkscape:version=0.48.2 r9819 + sodipodi:docname=Info.svg + defs + id=defs6457 +linearGradient + inkscape:collect=always + xlink:href=#linearGradient7068 + id=linearGradient6148 + gradientUnits=userSpaceOnUse + x1=-207.56598 + y1=1449.8578 + x2=-168.14899 + y2=1489.3698 / +linearGradient + id=linearGradient7068 + stop + id=stop7070 + offset=0 + style=stop-color:#729fcf;stop-opacity:1; / + stop + id=stop7072 + offset=1 + style=stop-color:#3465a4;stop-opacity:1; / +/linearGradient +linearGradient + id=linearGradient7805-2-15 + stop + style=stop-color:#91adcf;stop-opacity:1; + offset=0 + id=stop7807-7-4 / + stop + style=stop-color:#729fcf;stop-opacity:1; + offset=1 + id=stop7809-5-0 / +/linearGradient +linearGradient + y2=1430.0388 + x2=-229.48209 + y1=1499.8662 + x1=-157.48567 + gradientUnits=userSpaceOnUse + id=linearGradient8142 + xlink:href=#linearGradient7805-2-15 + inkscape:collect=always / + /defs + sodipodi:namedview + id=base + pagecolor=#ff + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0.0 + inkscape:pageshadow=2 + inkscape:zoom=30 + inkscape:cx=6.9533846 + inkscape:cy=11.270852 + inkscape:current-layer=g5992 + showgrid=false + inkscape:grid-bbox=true + inkscape:document-units=px + inkscape:snap-grids=false + inkscape:window-width=1440 + inkscape:window-height=844 + inkscape:window-x=0 + inkscape:window-y=26 + inkscape:window-maximized=1 +inkscape:grid + type=xygrid + id=grid6625 + empspacing=5 + visible=true + enabled=true + snapvisiblegridlinesonly=true / + /sodipodi:namedview + metadata + id=metadata6460 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title / + /cc:Work +/rdf:RDF + /metadata + g + id=layer1 + inkscape:label=Layer 1 + inkscape:groupmode=layer + transform=translate(0,-8) +g + transform=matrix(3.99002,0,0,3.99002,-1047.28,-2177.63) + id=g5992 + path + transform=matrix
[Libreoffice-commits] .: ooo_custom_images/tango
ooo_custom_images/tango/framework/res/info_26.png |binary ooo_custom_images/tango/framework/res/info_26.svg | 148 -- 2 files changed, 148 deletions(-) New commits: commit aee15f3f1cc5fa0ee23ac5f1344a193ed72f84f3 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Thu Dec 15 11:40:47 2011 +0100 SVG slipped through, should have been a PNG Icon by Alexander Wilms diff --git a/ooo_custom_images/tango/framework/res/info_26.png b/ooo_custom_images/tango/framework/res/info_26.png new file mode 100644 index 000..c63d0f4 Binary files /dev/null and b/ooo_custom_images/tango/framework/res/info_26.png differ diff --git a/ooo_custom_images/tango/framework/res/info_26.svg b/ooo_custom_images/tango/framework/res/info_26.svg deleted file mode 100644 index 0b41cb5..000 --- a/ooo_custom_images/tango/framework/res/info_26.svg +++ /dev/null @@ -1,148 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -!-- Created with Inkscape (http://www.inkscape.org/) -- - -svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://creativecommons.org/ns#; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - xmlns:xlink=http://www.w3.org/1999/xlink; - xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - width=24 - height=24 - id=svg6455 - version=1.1 - inkscape:version=0.48.2 r9819 - sodipodi:docname=Info.svg - defs - id=defs6457 -linearGradient - inkscape:collect=always - xlink:href=#linearGradient7068 - id=linearGradient6148 - gradientUnits=userSpaceOnUse - x1=-207.56598 - y1=1449.8578 - x2=-168.14899 - y2=1489.3698 / -linearGradient - id=linearGradient7068 - stop - id=stop7070 - offset=0 - style=stop-color:#729fcf;stop-opacity:1; / - stop - id=stop7072 - offset=1 - style=stop-color:#3465a4;stop-opacity:1; / -/linearGradient -linearGradient - id=linearGradient7805-2-15 - stop - style=stop-color:#91adcf;stop-opacity:1; - offset=0 - id=stop7807-7-4 / - stop - style=stop-color:#729fcf;stop-opacity:1; - offset=1 - id=stop7809-5-0 / -/linearGradient -linearGradient - y2=1430.0388 - x2=-229.48209 - y1=1499.8662 - x1=-157.48567 - gradientUnits=userSpaceOnUse - id=linearGradient8142 - xlink:href=#linearGradient7805-2-15 - inkscape:collect=always / - /defs - sodipodi:namedview - id=base - pagecolor=#ff - bordercolor=#66 - borderopacity=1.0 - inkscape:pageopacity=0.0 - inkscape:pageshadow=2 - inkscape:zoom=30 - inkscape:cx=6.9533846 - inkscape:cy=11.270852 - inkscape:current-layer=g5992 - showgrid=false - inkscape:grid-bbox=true - inkscape:document-units=px - inkscape:snap-grids=false - inkscape:window-width=1440 - inkscape:window-height=844 - inkscape:window-x=0 - inkscape:window-y=26 - inkscape:window-maximized=1 -inkscape:grid - type=xygrid - id=grid6625 - empspacing=5 - visible=true - enabled=true - snapvisiblegridlinesonly=true / - /sodipodi:namedview - metadata - id=metadata6460 -rdf:RDF - cc:Work - rdf:about= -dc:formatimage/svg+xml/dc:format -dc:type - rdf:resource=http://purl.org/dc/dcmitype/StillImage; / -dc:title / - /cc:Work -/rdf:RDF - /metadata - g - id=layer1 - inkscape:label=Layer 1 - inkscape:groupmode=layer - transform=translate(0,-8) -g - transform=matrix(3.99002,0,0,3.99002,-1047.28,-2177.63) - id=g5992 - path - transform=matrix(0.06715897,0,0,0.06715897,278.37153,452.29962) - d=m -156.33689,1465.8986 a 35.079124,35.079124 0 1 1 -70.15825,0 35.079124,35.079124 0 1 1 70.15825,0 z - sodipodi:ry=35.079124 - sodipodi:rx=35.079124 - sodipodi:cy=1465.8986 - sodipodi:cx=-191.41602 - id=path6618 - style=fill:url(#linearGradient6148);fill-opacity:1;stroke:#36567c;stroke-width:4.47818613;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline - sodipodi:type=arc - inkscape:export-filename=/home/alexander/Dokumente/LibreOffice/Icons.png - inkscape:export-xdpi=90 - inkscape:export-ydpi=90 / - g - style=font-size:3.4565661px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff;fill-opacity:1;stroke:none;display:inline;font-family:Sans;-inkscape-font-specification:Sans Italic - id=text6628 -path - d=m 265.8376,550.2211 -0.23967,1.12406 c -0.0135,0.063
[Libreoffice-commits] .: autodoc/source basctl/source basic/source
autodoc/source/parser/cpp/all_toks.hxx |4 ++--
basctl/source/basicide/baside2.cxx |2 +-
basctl/source/basicide/macrodlg.cxx|2 +-
basic/source/classes/sb.cxx|2 +-
basic/source/classes/sbunoobj.cxx | 10 +-
basic/source/classes/sbxmod.cxx|2 +-
basic/source/inc/parser.hxx|2 +-
basic/source/runtime/methods.cxx |6 +++---
basic/source/runtime/runtime.cxx |2 +-
basic/source/sbx/sbxobj.cxx|2 +-
basic/source/sbx/sbxvalue.cxx |2 +-
basic/source/sbx/sbxvar.cxx|4 ++--
12 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 583582c5bf11abf04393c378131be75f14a46922
Author: Noel Grandin n...@peralex.com
Date: Mon Dec 12 22:35:05 2011 +0100
German translations
By Mike Whiteley/Noel Grandin, some smaller changes by myself; changes to
binfilter removed from patch
diff --git a/autodoc/source/parser/cpp/all_toks.hxx
b/autodoc/source/parser/cpp/all_toks.hxx
index 4aeae6e..1531dd7 100644
--- a/autodoc/source/parser/cpp/all_toks.hxx
+++ b/autodoc/source/parser/cpp/all_toks.hxx
@@ -189,8 +189,8 @@ class Tok_UnblockMacro : public ::TextToken
class Tok_TypeKey : public cpp::Token // file-type-PE
class Tok_Template : public cpp::Token // file
class Tok_Namespace : public cpp::Token// file
-class Tok_Bracket : public cpp::Token // ueberall
-class Tok_Separator : public cpp::Token// ueberall
+class Tok_Bracket : public cpp::Token // everywhere
+class Tok_Separator : public cpp::Token// everywhere
class Tok_Identifier : public cpp::Token // ueberall
class Tok_NameSeparator : public cpp::Token// Type, Name
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index cf245ca..7adc866 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -248,7 +248,7 @@ void ModulWindow::Resize()
}
-// Import von baside4.cxx
+// Import of baside4.cxx
void CreateEngineForBasic( StarBASIC* pBasic );
void ModulWindow::CheckCompileBasic()
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index 0ddc22d..dea7cc0 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -36,7 +36,7 @@
#include macrodlg.hrc
#include basidesh.hrc
#include basidesh.hxx
-#include baside2.hrc // ID's fuer Imagese
+#include baside2.hrc // ID's for Images
#include basobj.hxx
#include baside3.hxx
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0256f88..09be4c7 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1455,7 +1455,7 @@ sal_Bool StarBASIC::IsCompilerError() { return
GetSbData()-bCompiler; }
// through the table SFX_VB_ErrorTab[]. This is indeed not with good
performance,
// but it consumes much less memory than corresponding switch blocs.
// Because the conversion of error codes has not to be fast. there is no
-// binaere search by VB-Error - SFX-Error.
+// binary search by VB Error - Error SFX.
// Map back new error codes to old, Sbx-compatible
sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 605de05..b2b6ffd 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2471,7 +2471,7 @@ void SbUnoObject::doIntrospection( void )
if( !mxUnoAccess.is() )
{
-// #51475 mark an invalid objekt kennzeichnen (no mxMaterialHolder)
+// #51475 mark to indicate an invalid object (no mxMaterialHolder)
return;
}
@@ -2701,9 +2701,9 @@ SbxVariable* SbUnoObject::Find( const String rName,
SbxClassType t )
{
Any aAny = xNameAccess-getByName( aUName2 );
-// ATTENTION: Die hier erzeugte Variable darf wegen
bei XNameAccess
-// nicht als feste Property in das Object aufgenommen
werden und
-// wird daher nirgendwo gehalten.
+// ATTENTION: Because of XNameAccess, the variable
generated here
+// may not be included as a fixed property in the
object and therefore
+// won't be stored anywhere.
// If this leads to problems, it has to be created
synthetically or
// a class SbUnoNameAccessProperty, whose existence
had to be checked
// constantly and which were if necessary thrown away
@@ -2972,7 +2972,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic,
SbxArray rPar, sal_Bool bWrit
if( !xUnoObj )
return;
-// return the objekt
+// return the object
SbxVariableRef refVar
[Libreoffice-commits] .: chart2/source cppu/source dmake/tests framework/inc idlc/inc l10ntools/source linguistic/source odk/examples padmin/source qadevOOo/tests sfx2/source solenv/gbuild sw/source u
chart2/source/view/axes/VCartesianAxis.cxx
|2 +-
cppu/source/threadpool/threadpool.hxx
|2 +-
dmake/tests/recipes-9
|2 +-
framework/inc/threadhelp/fairrwlock.hxx
|4 ++--
idlc/inc/idlc/errorhandler.hxx
|2 +-
l10ntools/source/xmlparse.cxx
|2 +-
linguistic/source/convdic.cxx
|2 +-
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Thumbs.java
|2 +-
padmin/source/padialog.src
|2 +-
qadevOOo/tests/java/ifc/frame/_XStorable.java
|4 ++--
qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java
|2 +-
qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java
|6 +++---
sfx2/source/view/viewprn.cxx
|2 +-
solenv/gbuild/Module.mk
|2 +-
sw/source/core/txtnode/thints.cxx
|2 +-
sw/source/ui/uiview/view2.cxx
|2 +-
udkapi/com/sun/star/test/XSimpleTest.idl
|2 +-
wizards/com/sun/star/wizards/web/FTPDialog.java
|2 +-
xmerge/source/activesync/XMergeFilter.cpp
|2 +-
19 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit ad2eb6c4ba3ca36e2302c721a106dac80d266325
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Thu Dec 8 09:05:20 2011 +0100
Less succes, more success
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index b345c47..2d73cb7 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -600,7 +600,7 @@ bool VCartesianAxis::createTextShapes(
, TickFactory_2D* pTickFactory
, sal_Int32 nScreenDistanceBetweenTicks )
{
-//returns true if the text shapes have been created succesfully
+//returns true if the text shapes have been created successfully
//otherwise false - in this case the AxisLabelProperties have changed
//and contain new instructions for the next try for text shape creation
diff --git a/cppu/source/threadpool/threadpool.hxx
b/cppu/source/threadpool/threadpool.hxx
index 273798c..498ea4a 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -120,7 +120,7 @@ namespace cppu_threadpool {
void * enter( const ByteSequence aThreadId, sal_Int64 nDisposeId );
/
- * @return true, if queue could be succesfully revoked.
+ * @return true, if queue could be successfully revoked.
/
sal_Bool revokeQueue( const ByteSequence aThreadId , sal_Bool
bAsynchron );
diff --git a/dmake/tests/recipes-9 b/dmake/tests/recipes-9
index 409b6cb..fdc7853 100755
--- a/dmake/tests/recipes-9
+++ b/dmake/tests/recipes-9
@@ -83,7 +83,7 @@ else
fi
-# Test 4 - Ignore a succesfully executed, but failing recipe.
+# Test 4 - Ignore a successfully executed, but failing recipe.
cat $file1 EOT
SHELL*:=/bin/sh
SHELLFLAGS*:=-ce
diff --git a/framework/inc/threadhelp/fairrwlock.hxx
b/framework/inc/threadhelp/fairrwlock.hxx
index a47d451..72cbf42 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -125,7 +125,7 @@ class FairRWLock : public IRWLock
inline virtual void acquireReadAccess()
{
// Put call in SERIALIZE-queue!
-// After successful acquiring this mutex we are alone ...
+// After successfully acquiring this mutex we are alone ...
::osl::MutexGuard aSerializeGuard( m_aSerializer );
// ... but we should synchronize us with other reader!
@@ -190,7 +190,7 @@ class FairRWLock : public IRWLock
// are registered (not for releasing them!) or writer finished
their work!
// Don't use a guard to do so - because you must hold the mutex
till
// you call releaseWriteAccess()!
-// After succesfull acquire you have to wait for current working
reader.
+// After successfully acquiring you have to wait for current
working reader.
// Used condition will open by last gone reader object.
m_aSerializer.acquire();
m_aWriteCondition.wait();
diff --git a/idlc
[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] .: sw/source
sw/source/ui/dialog/wordcountdialog.src | 53
1 file changed, 27 insertions(+), 26 deletions(-)
New commits:
commit 52d5644828ac5528d8b5fe6dd644669364f35bce
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Mon Nov 28 19:07:21 2011 +0100
Some changes to the Word Count UI
diff --git a/sw/source/ui/dialog/wordcountdialog.src
b/sw/source/ui/dialog/wordcountdialog.src
index 7d95371..7c4a5f9 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -32,7 +32,7 @@ ModelessDialog DLG_WORDCOUNT
HelpID = HID_DLG_WORDCOUNT ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 170 , 132 ) ;
+Size = MAP_APPFONT ( 170 , 136 ) ;
Text [ en-US ] = Word Count ;
Moveable = TRUE ;
@@ -42,102 +42,103 @@ ModelessDialog DLG_WORDCOUNT
FixedLine FL_CURRENT
{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 158 , 8 ) ;
+Pos = MAP_APPFONT ( 5 , 5 ) ;
+Size = MAP_APPFONT ( 160 , 8 ) ;
Text [ en-US ] = Current selection;
};
FixedText FT_CURRENTWORD
{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
+Pos = MAP_APPFONT ( 10 , 16 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Words:;
};
FixedText FI_CURRENTWORD
{
-Pos = MAP_APPFONT ( 111 , 14 ) ;
+Pos = MAP_APPFONT ( 114 , 16 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedText FT_CURRENTCHARACTER
{
-Pos = MAP_APPFONT ( 12 , 26 ) ;
+Pos = MAP_APPFONT ( 10 , 28 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Characters:;
};
FixedText FI_CURRENTCHARACTER
{
-Pos = MAP_APPFONT ( 111 , 26 ) ;
+Pos = MAP_APPFONT ( 114 , 28 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedText FT_CURRENTCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 12 , 38 ) ;
+Pos = MAP_APPFONT ( 10 , 40 ) ;
Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = Characters excluding spaces:;
};
FixedText FI_CURRENTCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 111 , 38 ) ;
+Pos = MAP_APPFONT ( 114 , 40 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedLine FL_DOC
{
-Pos = MAP_APPFONT ( 6, 52 ) ;
-Size = MAP_APPFONT ( 158 , 8 ) ;
+Pos = MAP_APPFONT ( 5, 54 ) ;
+Size = MAP_APPFONT ( 160 , 8 ) ;
Text [ en-US ] = Whole document;
};
FixedText FT_DOCWORD
{
-Pos = MAP_APPFONT ( 12, 63 ) ;
+Pos = MAP_APPFONT ( 10, 65 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Words:;
};
FixedText FI_DOCWORD
{
-Pos = MAP_APPFONT ( 111 , 63 ) ;
+Pos = MAP_APPFONT ( 114 , 65 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedText FT_DOCCHARACTER
{
-Pos = MAP_APPFONT ( 12 , 75 ) ;
+Pos = MAP_APPFONT ( 10 , 77 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Characters:;
};
FixedText FI_DOCCHARACTER
{
-Pos = MAP_APPFONT ( 111, 75 ) ;
+Pos = MAP_APPFONT ( 114, 77 ) ;
Size = MAP_APPFONT ( 50, 8 ) ;
Right = TRUE;
};
FixedText FT_DOCCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 12 , 87 ) ;
+Pos = MAP_APPFONT ( 10 , 89 ) ;
Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = Characters excluding spaces:;
};
FixedText FI_DOCCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 111, 87 ) ;
+Pos = MAP_APPFONT ( 114, 89 ) ;
Size = MAP_APPFONT ( 50, 8 ) ;
Right = TRUE;
};
FixedLine FL_BOTTOM
{
-Pos = MAP_APPFONT ( 6 , 101 ) ;
-Size = MAP_APPFONT ( 158 , 8 ) ;
+Pos = MAP_APPFONT ( 0 , 103 ) ;
+Size = MAP_APPFONT ( 170 , 8 ) ;
};
-OKButtonPB_OK
+HelpButton PB_HELP
{
-Pos = MAP_APPFONT ( 61 , 112 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-DefButton = TRUE ;
+Pos = MAP_APPFONT ( 5 , 114 ) ;
+Size = MAP_APPFONT ( 50 , 15 ) ;
};
-HelpButton PB_HELP
+OKButtonPB_OK
{
-Pos = MAP_APPFONT ( 114 , 112 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 115 , 114 ) ;
+Size = MAP_APPFONT ( 50 , 15 ) ;
+DefButton = TRUE ;
+Text [ en-US ] = ~Close;
};
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo_custom_images/crystal ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_images/tango
ooo_custom_images/crystal/vcl/res/msgbox.png|binary ooo_custom_images/human/vcl/res/msgbox.png |binary ooo_custom_images/industrial/vcl/res/msgbox.png |binary ooo_custom_images/oxygen/vcl/res/msgbox.png |binary ooo_custom_images/tango/vcl/res/msgbox.png |binary 5 files changed New commits: commit a382228bc747d6a862287b06f31e5c2e4e0cd5a3 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Thu Dec 1 13:05:33 2011 +0100 Use themed icons for message boxes again diff --git a/ooo_custom_images/crystal/vcl/res/msgbox.png b/ooo_custom_images/crystal/vcl/res/msgbox.png new file mode 100644 index 000..e7397bc Binary files /dev/null and b/ooo_custom_images/crystal/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/human/vcl/res/msgbox.png b/ooo_custom_images/human/vcl/res/msgbox.png new file mode 100644 index 000..1012e98 Binary files /dev/null and b/ooo_custom_images/human/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/industrial/vcl/res/msgbox.png b/ooo_custom_images/industrial/vcl/res/msgbox.png new file mode 100644 index 000..2258cd4 Binary files /dev/null and b/ooo_custom_images/industrial/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/oxygen/vcl/res/msgbox.png b/ooo_custom_images/oxygen/vcl/res/msgbox.png new file mode 100644 index 000..e7397bc Binary files /dev/null and b/ooo_custom_images/oxygen/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/tango/vcl/res/msgbox.png b/ooo_custom_images/tango/vcl/res/msgbox.png new file mode 100644 index 000..c47fd78 Binary files /dev/null and b/ooo_custom_images/tango/vcl/res/msgbox.png differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
