[PATCH] alignment.ui widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3970 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/3970/1 alignment.ui widget Change-Id: I45c7351e934ebd557af0ab07767ec0b61ce2299f --- A starmath/uiconfig/smath/ui/alignment.ui 1 file changed, 172 insertions(+), 0 deletions(-) diff --git a/starmath/uiconfig/smath/ui/alignment.ui b/starmath/uiconfig/smath/ui/alignment.ui new file mode 100644 index 000..5e92705 --- /dev/null +++ b/starmath/uiconfig/smath/ui/alignment.ui @@ -0,0 +1,172 @@ + + + + +False +6 +Alignment +dialog + + +False +12 + + +False +vertical +start + + +gtk-ok +True +True +True +True +True +False +True + + +False +True +0 + + + + +gtk-cancel +True +True +True +False +True + + +False +True +1 + + + + +gtk-help +True +True +True +False +True + + +False +True +2 + + + + +False +True +end +0 + + + + +True +False +0 +none + + +True +False +6 +12 + + +True +False +vertical + + +_Left +True +True +False +False +True +0 +True +True + + +False +True +0 + + + + +_Centered +True +True +False +False +True +0 +True +True + + +False +True +1 + + + + +_Right +True +True +False +False +True +0 +True +True + + +False +True +2 + + + + + + + + +True +False +Horizontal +True +True + + + + +False +True +1 + + + + + + ok + cancel + help + + + -- To view, visit https://gerrit.libreoffice.org/3970 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45c7351e934ebd557af0ab07767ec0b61ce2299f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] catalog.ui widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3971 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3971/1 catalog.ui widget Change-Id: I1a67c1c9b30b56d3c0739c2f77abfc24a941dad4 --- A starmath/uiconfig/smath/ui/catalog.ui 1 file changed, 187 insertions(+), 0 deletions(-) diff --git a/starmath/uiconfig/smath/ui/catalog.ui b/starmath/uiconfig/smath/ui/catalog.ui new file mode 100644 index 000..0b49e41 --- /dev/null +++ b/starmath/uiconfig/smath/ui/catalog.ui @@ -0,0 +1,187 @@ + + + + +False +6 +Symbols +dialog + + +False +12 + + +False +vertical +start + + +_Insert +True +True +True +False +True + + +False +True +0 + + + + +_Close +True +True +True +False +True + + +False +True +1 + + + + +_Edit... +True +True +True +False +True + + +False +True +2 + + + + +gtk-help +True +True +True +False +True + + +False +True +3 + + + + +False +True +end +0 + + + + +True +False + + +True +False +vertical + + +True +False +_Symbol set +True + + +False +True +0 + + + + +True +True +● + + +False +True +1 + + + + +True +True +in + + +True +True +liststore1 + + + + +False +True +2 + + + + +True +False +label + + +False +True +3 + + + + +False +True +0 + + + + +True +False +gtk-missing-image + + +False +True +1 + + + + +False +True +1 + + + + + + button3 + button1 + button2 + help + + + + -- To view, visit https://gerrit.libreoffice.org/3971 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a67c1c9b30b56d3c0739c2f77abfc24a941dad4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests
qadevOOo/runner/util/AccessibilityTools.java| 100
--
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java |4
qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java |4
3 files changed, 90 insertions(+), 18 deletions(-)
New commits:
commit d702dd4396161f8e2e7396f5c24554088b752fcb
Author: Noel Grandin
Date: Thu May 16 11:39:40 2013 +0200
Java cleanup, AccessibilityTools..
was using a global variable. Yuck.
Fix it to use a local variable. Not perfect, but better.
Change-Id: I272ddc89402da53be7f19d2cd963b03b1a83
diff --git a/qadevOOo/runner/util/AccessibilityTools.java
b/qadevOOo/runner/util/AccessibilityTools.java
index 85cd442..c7cb483 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -17,6 +17,7 @@
*/
package util;
+import com.sun.star.accessibility.AccessibleStateType;
import com.sun.star.accessibility.XAccessible;
import com.sun.star.accessibility.XAccessibleComponent;
import com.sun.star.accessibility.XAccessibleContext;
@@ -32,7 +33,7 @@ import java.io.PrintWriter;
public class AccessibilityTools {
-public static XAccessible SearchedAccessible = null;
+private XAccessible SearchedAccessible = null;
private static boolean debug = false;
public AccessibilityTools() {
@@ -91,15 +92,12 @@ public class AccessibilityTools {
public static XAccessibleContext getAccessibleObjectForRole(XAccessible
xacc,
short role) {
-SearchedAccessible = null;
return getAccessibleObjectForRole_(xacc, role);
}
public static XAccessibleContext getAccessibleObjectForRole(XAccessible
xacc,
short role,
boolean ignoreShowing) {
-SearchedAccessible = null;
-
if (ignoreShowing) {
return getAccessibleObjectForRoleIgnoreShowing_(xacc, role);
} else {
@@ -107,12 +105,49 @@ public class AccessibilityTools {
}
}
+public XAccessible getSearchedAccessibleObjectForRole(XAccessible xacc,
+short role,
+boolean ignoreShowing) {
+SearchedAccessible = null;
+getSearchedAccessibleObjectForRole_(xacc, role, ignoreShowing);
+return SearchedAccessible;
+}
+
+private XAccessibleContext getSearchedAccessibleObjectForRole_(XAccessible
xacc,
+short role, boolean ignoreShowing) {
+XAccessibleContext ac = xacc.getAccessibleContext();
+boolean isShowing = isShowing(ac);
+
+if ((ac.getAccessibleRole() == role) && (!ignoreShowing || isShowing))
{
+SearchedAccessible = xacc;
+return ac;
+} else {
+int k = ac.getAccessibleChildCount();
+
+if (ac.getAccessibleChildCount() > 100) {
+k = 50;
+}
+
+for (int i = 0; i < k; i++) {
+try {
+XAccessibleContext ac2 =
getSearchedAccessibleObjectForRole_(ac.getAccessibleChild(i), role,
ignoreShowing);
+
+if (ac2 != null) {
+return ac2;
+}
+} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+System.out.println("Couldn't get Child");
+}
+}
+return null;
+}
+}
+
public static XAccessibleContext
getAccessibleObjectForRoleIgnoreShowing_(XAccessible xacc,
short role) {
XAccessibleContext ac = xacc.getAccessibleContext();
if (ac.getAccessibleRole() == role) {
-SearchedAccessible = xacc;
return ac;
} else {
int k = ac.getAccessibleChildCount();
@@ -140,11 +175,9 @@ public class AccessibilityTools {
public static XAccessibleContext getAccessibleObjectForRole_(XAccessible
xacc,
short role) {
XAccessibleContext ac = xacc.getAccessibleContext();
-boolean isShowing = ac.getAccessibleStateSet()
-.contains(com.sun.star.accessibility.AccessibleStateType.SHOWING);
+boolean isShowing = isShowing(ac);
if ((ac.getAccessibleRole() == role) && isShowing) {
-SearchedAccessible = xacc;
return ac;
} else {
int k = ac.getAccessibleChildCount();
@@ -194,7 +227,6 @@ public class AccessibilityTools {
if ((ac.getAccessibleRole() == role) &&
(ac.getAccessibleName().indexOf(name) > -1) &&
(utils.getImplName(ac).indexOf(implName) > -1)) {
-SearchedAccessible = xacc;
//System.out.println("FOUND the desired component -- "+
ac.getAccessibleName() +isShowing);
return ac;
@@ -228,8 +260,7 @@ public class AccessibilityTools {
String name,
String implName) {
XAccessibleContext ac = xacc.getAccessibleContext();
-boolean isShowing = ac.getAccessibleStateSet()
-
[Libreoffice-commits] buildbot.git: tb/tb_internals.sh
tb/tb_internals.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 98dc802651c8eae017e4baabfcfc9e825985d106
Author: Norbert Thiebaud
Date: Mon May 20 02:33:42 2013 -0500
tb: set tb_SEND_MAIL
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 9f08379..3dcf127 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -1348,7 +1348,7 @@ validate_tb_profile()
fi
fi
-if [ -z "${tb_SEND_MAIL}" ] ; then
+if [ -n "${TB_SEND_MAIL}" ] ; then
tb_SEND_MAIL="${TB_SEND_MAIL}"
fi
# if we want email to be sent, we must make sure that the required
parameters are set in the profile (or in the environment)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: tb/tb_internals.sh
tb/tb_internals.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 8d31df661e163bdf284d6b9806bb6a96d7892d68
Author: Norbert Thiebaud
Date: Mon May 20 02:39:19 2013 -0500
tb: re-activate email sending
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 3dcf127..de7b44d 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -1112,13 +1112,13 @@ send_mail_msg()
[ $V ] && log_msgs "send mail to ${to?} with subject \"${subject?}\""
[ $V ] && quiet=""
-#if [ -n "${log}" ] ; then
-#${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s
"${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o
"message-header=${headers?}" -a "${log?}"
-#elif [ -n "${headers?}" ] ; then
-#${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s
"${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o
"message-header=${headers?}"
-#else
-#${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s
"${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}"
-#fi
+if [ -n "${log}" ] ; then
+${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s
"${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o
"message-header=${headers?}" -a "${log?}"
+elif [ -n "${headers?}" ] ; then
+${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s
"${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o
"message-header=${headers?}"
+else
+${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s
"${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}"
+fi
}
#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
REMINDER: 4.1 feature freeze and 4.1.0.0.beta1 release
Hi, please note that the feature freeze and commit deadline for 4.1.0.0.beta1 is today, May 20, 2013. The plan is to create the libreoffice-4-1 branch on Tuesday. Then we will make sure that it is buildable and usable and create the beta1 tag on that branch. It will hopefully happen on Tuesday. Please, let me know if you are late with a feature. It is possible to wait few hours or one day. Please, do not commit too incomplete or broken stuff that could make beta1 unusable. We need to have it in a good state for testing. Note that there is still possibility to add late features with 3 approvals from people with different affiliation. The branch will be announced on the mailing list and in the irc #libreoffice-dev channel title. Once we have the branch, please cherry pick useful fixes from master there. We do not plan to merge between the branches. So, we kindly ask everyone to keep master and the branch in sync. See also http://wiki.documentfoundation.org/ReleasePlan#4.1_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 74/fa27edc0a720183d59cc44b6b11327a47fb1b1
74/fa27edc0a720183d59cc44b6b11327a47fb1b1 |1 + 1 file changed, 1 insertion(+) New commits: commit ae8745328d811bc3592a115f4f02f0cf1612196b Author: Caolán McNamara Date: Mon May 20 09:20:35 2013 +0100 Notes added by 'git notes add' diff --git a/74/fa27edc0a720183d59cc44b6b11327a47fb1b1 b/74/fa27edc0a720183d59cc44b6b11327a47fb1b1 new file mode 100644 index 000..5a18980 --- /dev/null +++ b/74/fa27edc0a720183d59cc44b6b11327a47fb1b1 @@ -0,0 +1 @@ +prefer: 8545bf9afc3d4adfd3e7d33c5063a3ee259327a6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/vba/vbafield.cxx | 60 ++
sw/source/ui/wrtsh/wrtsh1.cxx |6 ++--
2 files changed, 29 insertions(+), 37 deletions(-)
New commits:
commit 0c45b5548537cffddc3fbdd6b1c2b9a8a1bdbc4a
Author: Matthias Freund
Date: Sun May 19 23:56:33 2013 +0200
fdo#39468 Comment translation GER-ENG
modified: sw/source/ui/vba/vbafield.cxx
modified: sw/source/ui/wrtsh/wrtsh1.cxx
Change-Id: I503a12e22d03b2b57a818701cdfbe4ecc94d89a1
Reviewed-on: https://gerrit.libreoffice.org/3965
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index df729ad..a903008 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -32,8 +32,6 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-// *** SwVbaField ***
-
SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >&
rParent, const uno::Reference< uno::XComponentContext >& rContext, const
css::uno::Reference< css::text::XTextDocument >& rDocument, const
uno::Reference< css::text::XTextField >& xTextField) throw (
uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ), mxTextDocument(
rDocument )
{
mxTextField.set( xTextField, uno::UNO_QUERY_THROW );
@@ -69,7 +67,7 @@ SwVbaField::getServiceNames()
return aServiceNames;
}
-// *** SwVbaReadFieldParams ***
+// SwVbaReadFieldParams
// the codes are copied from ww8par5.cxx
class SwVbaReadFieldParams
{
@@ -90,15 +88,12 @@ public:
String GetFieldName()const { return aFieldName; }
};
-
SwVbaReadFieldParams::SwVbaReadFieldParams( const String& _rData )
: aData( _rData ), nLen( _rData.Len() ), nNext( 0 )
{
-/*
-erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem
-Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl
-(also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird
-*/
+// First search for an opening parenthesis or a space or a quotation mark
+// or a backslash, so that the field command
+// (thus INCLUDEPICTURE or ...) is ignored.
while( (nLen > nNext) && (aData.GetChar( nNext ) == ' ') )
++nNext;
@@ -116,7 +111,6 @@ SwVbaReadFieldParams::SwVbaReadFieldParams( const String&
_rData )
aFieldName = aData.Copy( 0, nFnd );
}
-
SwVbaReadFieldParams::~SwVbaReadFieldParams()
{
}
@@ -129,11 +123,10 @@ String SwVbaReadFieldParams::GetResult() const
: aData.Copy( nFnd, (nSavPtr - nFnd) );
}
-
// ret: -2: NOT a '\' parameter but normal Text
long SwVbaReadFieldParams::SkipToNextToken()
{
-long nRet = -1; // Ende
+long nRet = -1; // end
if (
(STRING_NOTFOUND != nNext) && (nLen > nNext) &&
STRING_NOTFOUND != (nFnd = FindNextStringPiece(nNext))
@@ -144,7 +137,7 @@ long SwVbaReadFieldParams::SkipToNextToken()
if ('\\' == aData.GetChar(nFnd) && '\\' != aData.GetChar(nFnd + 1))
{
nRet = aData.GetChar(++nFnd);
-nNext = ++nFnd; // und dahinter setzen
+nNext = ++nFnd; // and set behind
}
else
{
@@ -164,21 +157,20 @@ long SwVbaReadFieldParams::SkipToNextToken()
return nRet;
}
-// FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette
-// bis zum Blank oder naechsten "\" oder zum schliessenden Anfuehrungszeichen
-// oder zum String-Ende von pStr.
-//
-// Ausgabe ppNext (falls ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
+// FindNextPara is searching for the next Backslash-Parameter or the next
string
+// until blank or the next "\" or until the closing quotation mark
+// or until the string end of pStr.
//
-// Returnwert: 0 falls String-Ende erreicht,
-// ansonsten Anfang des Paramters bzw. der Zeichenkette
+// Output ppNext (if ppNext != 0) beginning of the search for the next
parameter or 0
//
+// Return value: 0 if String-End reached, otherwise begin of the paramater or
the string
+
xub_StrLen SwVbaReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
{
-xub_StrLen n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart; // Anfang
-xub_StrLen n2; // Ende
+xub_StrLen n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart; // Start
+xub_StrLen n2; // End
-nNext = STRING_NOTFOUND;// Default fuer nicht gefunden
+nNext = STRING_NOTFOUND;// Default for not found
while( (nLen > n) && (aData.GetChar( n ) == ' ') )
++n;
@@ -186,36 +178,36 @@ xub_StrLen
SwVbaReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
if( nLen == n )
return STRING_NOTFOUND; // String End reached!
-if( (aData.GetChar( n ) == '"') // Anfuehrungszeichen vor Para?
+if(
[Libreoffice-commits] core.git: sw/source
sw/source/ui/vba/vbafield.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 869b787deeda5b45d5b0732d1bf777c26abce51e
Author: Thomas Arnhold
Date: Mon May 20 10:26:34 2013 +0200
add a copy and paste note
Change-Id: I8dcb9c71f5c72bda24d55a6f550208f30e42cb4f
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index a903008..cab3aca 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -68,6 +68,7 @@ SwVbaField::getServiceNames()
}
// SwVbaReadFieldParams
+// FIXME? copy and paste code
// the codes are copied from ww8par5.cxx
class SwVbaReadFieldParams
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#39468 Comment translation GER-ENG
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3965 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3965 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I503a12e22d03b2b57a818701cdfbe4ecc94d89a1 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund Gerrit-Reviewer: Thomas Arnhold ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 182 -
1 file changed, 119 insertions(+), 63 deletions(-)
New commits:
commit fc91501f9f0a24ccfa69c2b4baf070aac9e2d0f0
Author: Armin Le Grand
Date: Tue Oct 23 10:49:25 2012 +
Resolves: #i121185# corrected handling of gradients in rotated metafiles
(cherry picked from commit 498926039ce717631eda046b1aa256efd24dfdf6)
Conflicts:
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
Change-Id: Ib1a96888d0990f6f9aa573e308736d40b694a613
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 706020b..0bcb413 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1537,78 +1537,108 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D :
{
-const primitive2d::PolyPolygonGradientPrimitive2D&
rGradientCandidate = static_cast< const
primitive2d::PolyPolygonGradientPrimitive2D& >(rCandidate);
-basegfx::B2DPolyPolygon
aLocalPolyPolygon(rGradientCandidate.getB2DPolyPolygon());
+basegfx::B2DVector aScale, aTranslate;
+double fRotate, fShearX;
-// #i112245# Metafiles use tools Polygon and are not able
to have more than 65535 points
-// per polygon. Split polygon until there are less than
that
-while(fillPolyPolygonNeededToBeSplit(aLocalPolyPolygon))
-;
+maCurrentTransformation.decompose(aScale, aTranslate,
fRotate, fShearX);
-// for support of MetaCommentActions of the form
XGRAD_SEQ_BEGIN, XGRAD_SEQ_END
-// it is safest to use the VCL OutputDevice::DrawGradient
method which creates those.
-// re-create a VCL-gradient from FillGradientPrimitive2D
and the needed tools PolyPolygon
-Gradient aVCLGradient;
-impConvertFillGradientAttributeToVCLGradient(aVCLGradient,
rGradientCandidate.getFillGradient(), false);
-aLocalPolyPolygon.transform(maCurrentTransformation);
+if(!basegfx::fTools::equalZero(fRotate) ||
!basegfx::fTools::equalZero(fShearX))
+{
+// #121185# When rotation or shear is used, a VCL
Gradient cannot be used directly.
+// This is because VCL Gradient mechanism does *not*
support to rotate the gradient
+// with objects and this case is not expressable in a
Metafile (and cannot be added
+// since the FileFormats used, e.g. *.wmf, do not
support it either).
+// Such cases happen when a graphic object uses a
Metafile as graphic information or
+// a fill style definition uses a Metafile. In this
cases the graphic content is
+// rotated with the graphic or filled object; this is
not supported by the target
+// format of this conversion renderer - Metafiles.
+// To solve this, not a Gradient is written, but the
decomposition of this object
+// is written to the Metafile. This is the
PolyPolygons building the gradient fill.
+// These will need more space and time, but the result
will be as if the Gradient
+// was rotated with the object.
+// This mechanism is used by all exporters still not
using Primtives (e.g. Print,
+// Slideshow, Export rto PDF, export to Picture, ...)
but relying on Metafile
+// transfers. One more reason to *change* these to
primitives.
+// BTW: One more example how useful the principles of
primitives are; the decomposition
+// is by definition a simpler, maybe more expensive
representation of the same content.
+
process(rCandidate.get2DDecomposition(getViewInformation2D()));
+}
+else
+{
+const primitive2d::PolyPolygonGradientPrimitive2D&
rGradientCandidate = static_cast< const
primitive2d::PolyPolygonGradientPrimitive2D& >(rCandidate);
+basegfx::B2DPolyPolygon
aLocalPolyPolygon(rGradientCandidate.getB2DPolyPolygon());
-// #i82145# ATM VCL printing of gradients using curved
shapes does not work,
-// i submitted the bug with the given ID to THB. When that
task is fixed it is
-// necessary to again remove this subdivision since it
decreases possible
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 49/8926039ce717631eda046b1aa256efd24dfdf6
49/8926039ce717631eda046b1aa256efd24dfdf6 |1 + 1 file changed, 1 insertion(+) New commits: commit 94e013cf8fe59d17ad39cdd2da4cfc896a779b21 Author: Caolán McNamara Date: Mon May 20 09:31:34 2013 +0100 Notes added by 'git notes add' diff --git a/49/8926039ce717631eda046b1aa256efd24dfdf6 b/49/8926039ce717631eda046b1aa256efd24dfdf6 new file mode 100644 index 000..121b040 --- /dev/null +++ b/49/8926039ce717631eda046b1aa256efd24dfdf6 @@ -0,0 +1 @@ +merged as: fc91501f9f0a24ccfa69c2b4baf070aac9e2d0f0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e3/ec94e68f63e4e9fda829c9214f89dd5ffc4df2
e3/ec94e68f63e4e9fda829c9214f89dd5ffc4df2 |1 + 1 file changed, 1 insertion(+) New commits: commit 4510f787132f996c2f45b95a2383418a767374ec Author: Caolán McNamara Date: Mon May 20 09:32:15 2013 +0100 Notes added by 'git notes add' diff --git a/e3/ec94e68f63e4e9fda829c9214f89dd5ffc4df2 b/e3/ec94e68f63e4e9fda829c9214f89dd5ffc4df2 new file mode 100644 index 000..06146ad --- /dev/null +++ b/e3/ec94e68f63e4e9fda829c9214f89dd5ffc4df2 @@ -0,0 +1 @@ +merged as: 3df12741fa949d1b0e90d45aceeaa99679066b83 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/b092c42ced76bf8b9bc427b5e6216dcb96b2d5
4f/b092c42ced76bf8b9bc427b5e6216dcb96b2d5 |1 + 1 file changed, 1 insertion(+) New commits: commit 12e2c229ec13039cb162a1beb7f65b611baef6f9 Author: Caolán McNamara Date: Mon May 20 09:37:54 2013 +0100 Notes added by 'git notes add' diff --git a/4f/b092c42ced76bf8b9bc427b5e6216dcb96b2d5 b/4f/b092c42ced76bf8b9bc427b5e6216dcb96b2d5 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/4f/b092c42ced76bf8b9bc427b5e6216dcb96b2d5 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dictionaries drawinglayer/source
dictionaries |2 +-
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cf9078b54d3d436ad38cde254f426bd251b61b08
Author: Caolán McNamara
Date: Mon May 20 09:35:04 2013 +0100
correct bugtracker ids
Change-Id: I082857045bdca110c9eb07eb678c85e9a53687ad
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 0bcb413..ec5ad2d 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1309,7 +1309,7 @@ namespace drawinglayer
// write LineGeometry start marker
impStartSvtGraphicStroke(pSvtGraphicStroke);
-// #116162# When B&W is set as DrawMode,
DRAWMODE_WHITEFILL is used
+// #i116162# When B&W is set as DrawMode,
DRAWMODE_WHITEFILL is used
// to let all fills be just white; for lines
DRAWMODE_BLACKLINE is used
// so all line geometry is supposed to get black.
Since in the in-between
// stages of line geometry drawing filled polygons are
used (e.g. line
@@ -1544,7 +1544,7 @@ namespace drawinglayer
if(!basegfx::fTools::equalZero(fRotate) ||
!basegfx::fTools::equalZero(fShearX))
{
-// #121185# When rotation or shear is used, a VCL
Gradient cannot be used directly.
+// #i121185# When rotation or shear is used, a VCL
Gradient cannot be used directly.
// This is because VCL Gradient mechanism does *not*
support to rotate the gradient
// with objects and this case is not expressable in a
Metafile (and cannot be added
// since the FileFormats used, e.g. *.wmf, do not
support it either).
commit e42886ca2e4b62904c1eb2f424d74699a615a61c
Author: Caolán McNamara
Date: Mon May 20 09:51:18 2013 +0100
Updated core
Project: dictionaries 09bd32f75110b15e6be8a7bfc116535cead5682b
diff --git a/dictionaries b/dictionaries
index 4011efe..09bd32f7 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 4011efefecd48df593d358a304543ef4a8f9868d
+Subproject commit 09bd32f75110b15e6be8a7bfc116535cead5682b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f4/2ce34b26c988821c5c3a51a2ba552c685c94ca
f4/2ce34b26c988821c5c3a51a2ba552c685c94ca |1 + 1 file changed, 1 insertion(+) New commits: commit 87a358bf953ac22edbdf3c9bb5814659f8f1054a Author: Caolán McNamara Date: Mon May 20 09:52:44 2013 +0100 Notes added by 'git notes add' diff --git a/f4/2ce34b26c988821c5c3a51a2ba552c685c94ca b/f4/2ce34b26c988821c5c3a51a2ba552c685c94ca new file mode 100644 index 000..05b8a53 --- /dev/null +++ b/f4/2ce34b26c988821c5c3a51a2ba552c685c94ca @@ -0,0 +1 @@ +prefer: e42886ca2e4b62904c1eb2f424d74699a615a61c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Create liblcms2.so as a real library in solver.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3972 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/3972/1 Create liblcms2.so as a real library in solver. There was just a broken symbolic link liblcms2.so.2 -> liblcms2.so.4 in installation. Change-Id: I7a3c8f08a33c8971d9beb5fa06c706b25165b6d0 --- M RepositoryExternal.mk M lcms2/ExternalPackage_lcms2.mk M scp2/source/ooo/file_library_ooo.scp 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2762e4c..7ce4f66 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1643,18 +1643,14 @@ else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - lcms2 \ -)) - define gb_LinkTarget__use_lcms2 $(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - lcms2 \ +$(call gb_LinkTarget_add_libs,$(1),\ + -llcms2 \ ) endef diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 790c590..a945549 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -26,9 +26,6 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) endif else -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) -# NOTE: this is a symlink -$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2)) -$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4)) +$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so.2.0.4)) endif # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 03243b8..d0a4186 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -378,7 +378,7 @@ #ifdef MACOSX Name = STRING(CONCAT3(liblcms2,.2,UNXSUFFIX)); #else - Name = STRING(CONCAT3(liblcms2,UNXSUFFIX,.2)); + Name = STRING(CONCAT2(liblcms2,UNXSUFFIX)); #endif #elif defined(WNT) #ifdef _gcc3 -- To view, visit https://gerrit.libreoffice.org/3972 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a3c8f08a33c8971d9beb5fa06c706b25165b6d0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit e273602acd7da369e425f310fb2869d6cb55492b Author: Tor Lillqvist Date: Mon May 20 12:45:03 2013 +0300 Revert "Use bundled jpeg for the BUILD platform when cross-compiling" Causes trouble in other cases, need to figure out a more specific fix for the problem I see. This reverts commit 737a580a3b96efa2e389d2e72546484af8d4d78f. diff --git a/configure.ac b/configure.ac index 337af8b..66cef18 100644 --- a/configure.ac +++ b/configure.ac @@ -4131,7 +4131,6 @@ if test "$cross_compiling" = "yes"; then --with-parallelism="$with_parallelism" \ --without-doxygen \ --without-java \ ---without-system-jpeg \ ENABLE_PDFIMPORT=FALSE \ $sub_conf_opts \ --srcdir=$srcdir \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/activex/so_activex.def | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 026001cd5ac84bf5aa72e09ff6d7fa3a1bd08e7a Author: Tor Lillqvist Date: Mon May 20 12:38:57 2013 +0300 Avoid linker warning LNK4222 These symbols should not be assigned an ordinal as they are always located by name, using GetProcAddress(), says MSDN. Change-Id: I46caf7da634b1379a5baf5de631571335c6134ca diff --git a/extensions/source/activex/so_activex.def b/extensions/source/activex/so_activex.def index e3d56b0..d3f7d9e 100644 --- a/extensions/source/activex/so_activex.def +++ b/extensions/source/activex/so_activex.def @@ -3,11 +3,11 @@ LIBRARY "so_activex.dll" EXPORTS - DllCanUnloadNow @1 PRIVATE - DllGetClassObject @2 PRIVATE - DllRegisterServer @3 PRIVATE - DllUnregisterServer @4 PRIVATE - DllRegisterServerNative @5 PRIVATE - DllRegisterServerDoc@6 PRIVATE - DllUnregisterServerNative @7 PRIVATE - DllUnregisterServerDoc @8 PRIVATE + DllCanUnloadNow PRIVATE + DllGetClassObject PRIVATE + DllRegisterServer PRIVATE + DllUnregisterServer PRIVATE + DllRegisterServerNative PRIVATE + DllRegisterServerDocPRIVATE + DllUnregisterServerNative PRIVATE + DllUnregisterServerDoc PRIVATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
idlec.exe crashed during build in cygwin
Hi, I followed the intructions listed in https://wiki.documentfoundation.org/Development/Windows_Build_Dependenciesto build Libre Office in cygwin. Somewhere in the build, a windows error messaged popped up saying that idlec.exe had stopped responding. My ./autogen.sh and /opt/lo/bin/make logs are here: http://pastebin.com/eFa7qi6w Does anyone have an idea on how to get around it? Thanks in advance. Leow Yuan Yeow ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basctl/source scp2/source sc/util sdext/prj sdext/source
basctl/source/dlged/dlged.cxx| 15 --- sc/util/makefile.mk |2 -- scp2/source/ooo/file_library_ooo.scp |4 ++-- sdext/prj/d.lst |2 ++ sdext/source/minimizer/makefile.mk |4 sdext/source/presenter/makefile.mk |4 6 files changed, 12 insertions(+), 19 deletions(-) New commits: commit a0b26e586c25e5819ffb1eef78a5d7271d1273f5 Author: Yuri Dario Date: Mon May 20 08:29:17 2013 + i118923 - OS/2 port: cleanup of old and unusable code. diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 7c47ac3..0623039 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -1299,9 +1299,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )// not worki MapMode aMap( MAP_100TH_MM ); pPrinter->SetMapMode( aMap ); Font aFont; -#ifdef OS2 -//aFont.SetName( System::GetStandardFont( STDFONT_SWISS ).GetName() ); -#endif aFont.SetAlign( ALIGN_BOTTOM ); aFont.SetSize( Size( 0, 360 )); pPrinter->SetFont( aFont ); @@ -1313,18 +1310,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )// not worki lcl_PrintHeader( pPrinter, rTitle ); Bitmap aDlg; -#ifdef OS2 -Bitmap* pDlg = new Bitmap; -//pSbxForm->SnapShot( *pDlg ); -SvMemoryStream* pStrm = new SvMemoryStream; -*pStrm << *pDlg; -delete pDlg; -pStrm->Seek(0); -*pStrm >> aDlg; -delete pStrm; -#else -//pSbxForm->SnapShot( aDlg ); -#endif Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) ); double nPaperSzWidth = aPaperSz.Width(); double nPaperSzHeight = aPaperSz.Height(); commit 739aa74697c7e6bd2954d80dce5dda99c6da40e5 Author: Yuri Dario Date: Mon May 20 08:26:26 2013 + i118923 - OS/2 port: enable named exports also for os2. diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 06919ed..072fd4f 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -63,9 +63,7 @@ RESLIB1SRSFILES=\ # --- StarClac DLL SHL1TARGET= sc$(DLLPOSTFIX) -.IF "$(GUI)" != "OS2" SHL1USE_EXPORTS=name -.ENDIF SHL1IMPLIB= sci # dynamic libraries commit f543dc75e285523c8da486d5462c1fa46ab66bb3 Author: Yuri Dario Date: Mon May 20 08:24:41 2013 + i118923 - OS/2 port: use short names for dynamic libraries. diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4b22096..759ecab 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1356,7 +1356,7 @@ File gid_File_Lib_PresentationMinimizer #ifdef UNX Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX)); #elif defined OS2 -Name = "PresentationMinimizer.dll"; +Name = "PreMin.dll"; #else Name = "PresentationMinimizer.uno.dll"; #endif @@ -1369,7 +1369,7 @@ File gid_File_Lib_PresenterScreen #ifdef UNX Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); #elif defined OS2 -Name = "PresenterScreen.dll"; +Name = "PreScr.dll"; #else Name = "PresenterScreen.uno.dll"; #endif diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst index bd865bf..7e8c587 100644 --- a/sdext/prj/d.lst +++ b/sdext/prj/d.lst @@ -25,7 +25,9 @@ mkdir: %_DEST%\xml%_EXT% ..\%__SRC%\misc\PresenterScreen.component %_DEST%\xml%_EXT%\PresenterScreen.component ..\%__SRC%\bin\PresentationMinimizer*.dll %_DEST%\bin%_EXT%\PresentationMinimizer*.dll +..\%__SRC%\bin\PreMin*.dll %_DEST%\bin%_EXT%\PreMin*.dll ..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT% ..\%__SRC%\bin\PresenterScreen*.dll %_DEST%\bin%_EXT%\PresenterScreen*.dll +..\%__SRC%\bin\PreScr*.dll %_DEST%\bin%_EXT%\PreScr*.dll ..\%__SRC%\lib\PresenterScreen*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index da8b494..8d6ff37 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -55,7 +55,11 @@ SLOFILES=\ # --- Library --- +.IF "$(GUI)"=="OS2" +SHL1TARGET=PreMin +.ELSE SHL1TARGET= $(TARGET).uno +.ENDIF SHL1STDLIBS=\ $(CPPUHELPERLIB)\ diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index b1541c8..54c435a 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -95,7 +95,11 @@ SLOFILES=\ # --- Library --- +.IF "$(GUI)"=="OS2" +SHL1TARGET=PreScr +.ELSE SHL1TARGET=$(TARGET).uno +.ENDIF SHL1STDLIBS= \ $(CPPUHELPERLIB) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf
distro-configs/LibreOfficeAndroid.conf|1 - distro-configs/LibreOfficeAndroidX86.conf |1 - 2 files changed, 2 deletions(-) New commits: commit a9eab694d896426783c1826f4dfe3e2871043f84 Author: Tor Lillqvist Date: Mon May 20 12:57:58 2013 +0300 No need to avoid liblangtag for the BUILD platform Change-Id: I45852dfa38d9162d0fb5fa608974dbc78fe5d2f3 diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 087d48d..b503095 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -18,4 +18,3 @@ --without-junit --without-ppds --without-helppack-integration ---with-build-platform-configure-options=--disable-liblangtag diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index a01ae0e..db6c37e 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -18,4 +18,3 @@ --without-junit --without-ppds --without-helppack-integration ---with-build-platform-configure-options=--disable-liblangtag ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - cui/uiconfig extras/source include/vcl vcl/inc vcl/source vcl/uiconfig
cui/uiconfig/ui/optgeneralpage.ui |4 - cui/uiconfig/ui/optmemorypage.ui |2 cui/uiconfig/ui/select_persona_dialog.ui |2 extras/source/glade/libreoffice-catalog.xml.in |3 include/vcl/print.hxx |2 vcl/inc/printdlg.hxx |1 vcl/source/gdi/print3.cxx | 83 ++--- vcl/source/window/printdlg.cxx | 12 +++ vcl/uiconfig/ui/printdialog.ui | 20 +- 9 files changed, 100 insertions(+), 29 deletions(-) New commits: commit 235941bcd0e59c2831d5bc28683119eb6a2fd982 Author: Caolán McNamara Date: Mon May 20 11:25:41 2013 +0100 accidental hardcoding of %PRODUCTNAME as LibreOffice in some .ui files Change-Id: I1e6c2c1b64d8566b29c1a1510040aadbca2d977e diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui index 0db876a..7958965 100644 --- a/cui/uiconfig/ui/optgeneralpage.ui +++ b/cui/uiconfig/ui/optgeneralpage.ui @@ -140,7 +140,7 @@ 6 -_Use LibreOffice dialogs +_Use %PRODUCTNAME dialogs True True False @@ -205,7 +205,7 @@ 12 -Use LibreOffice _dialogs +Use %PRODUCTNAME _dialogs True True False diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index 3675e6c..d8c91b7 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -124,7 +124,7 @@ True False 0 -_Use for LibreOffice +_Use for %PRODUCTNAME True graphiccache diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 7db2004..84b1201 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -79,7 +79,7 @@ True False 0 -First visit Firefox Themes (https://addons.mozilla.org/firefox/themes). Find the Theme you like, and want to choose for LibreOffice. +First visit Firefox Themes (https://addons.mozilla.org/firefox/themes). Find the Theme you like, and want to choose for %PRODUCTNAME. True 54 commit f937ef20f57b306191f7583c2d47b5ad3f2a73ee Author: Caolán McNamara Date: Mon May 20 11:00:19 2013 +0100 Related: fdo#61186 add a toggle to override the paper format We now need a mechanism to instruct the print dialog that we want to force printing to use the printer settings configured paper. Particularly useful for nup printing and brochures scenario 3: forcing printing to use the printer settings paper a file->printer settings->properties->paper set a paper size, ideally something not used in the test doc, e.g. Executive b file->print->page layout and set pages per sheet to 4 the auto selection for paper will be the first paper size in use, i.e. legal c flip to options and toggle "use only paper size from printer preferences" preview should reconfigure as "Executive" Change-Id: Ie224c252c2cb6c9ee21be5c54e470bca1c7eb0bb diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index f40801e..40997dd 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -521,6 +521,8 @@ public: VCL_PLUGIN_PUBLIC void setLastPage( sal_Bool i_bLastPage ); SAL_DLLPRIVATE void setReversePrint( sal_Bool i_bReverse ); SAL_DLLPRIVATE bool getReversePrint() const; +SAL_DLLPRIVATE void setPapersizeFromSetup( sal_Bool i_bPapersizeFromSetup ); +SAL_DLLPRIVATE bool getPapersizeFromSetup() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 30e5fe8..f879a63 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -175,6 +175,7 @@ namespace vcl public: CheckBox* mpToFileBox; CheckBox* mpCollateSingleJobsBox; +CheckBox* mpPapersizeFromSetup; OutputOptPage( VclBuilder* ); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index cea6bc3..7ea71cc 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -151,6 +151,7 @@ public: sal_BoolmbFirstPage; sal_Bool
[PATCH] Create liblcms2.so.2 as a real library in solver.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3973 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3973/1 Create liblcms2.so.2 as a real library in solver. There was just a broken symbolic link liblcms2.so.2 -> liblcms2.so.2.0.4 in installation. Change-Id: If7425131373a6521e802c85d53fbee6a792b1604 --- M lcms2/ExternalPackage_lcms2.mk 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 790c590..9634571 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -27,8 +27,6 @@ endif else $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) -# NOTE: this is a symlink -$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2)) -$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4)) +$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4)) endif # vim: set noet sw=4 ts=4: -- To view, visit https://gerrit.libreoffice.org/3973 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7425131373a6521e802c85d53fbee6a792b1604 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Create liblcms2.so as a real library in solver.
Matúš Kukan has abandoned this change. Change subject: Create liblcms2.so as a real library in solver. .. Patch Set 2: Abandoned Obsoleted by https://gerrit.libreoffice.org/#/c/3973/ -- To view, visit https://gerrit.libreoffice.org/3972 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I7a3c8f08a33c8971d9beb5fa06c706b25165b6d0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/salinit.cxx |4 ++
sal/osl/unx/time.c | 93
sal/osl/w32/salinit.cxx |4 ++
sal/osl/w32/time.c | 12 ++
4 files changed, 83 insertions(+), 30 deletions(-)
New commits:
commit d8d55787b81cdc955b73c8befa4ab608f46e32aa
Author: Norbert Thiebaud
Date: Sun May 19 18:09:21 2013 -0500
Thread-safe version of osl_getGlobalTime
Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d
Reviewed-on: https://gerrit.libreoffice.org/3960
Tested-by: LibreOffice gerrit bot
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 327ca0e..c71c6a3 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -38,6 +38,9 @@ extern bool sal_use_syslog;
extern "C" {
+//From time.c
+void sal_initGlobalTimer();
+
void sal_detail_initialize(int argc, char ** argv) {
#if defined MACOSX
// On Mac OS X, soffice can restart itself via exec (see restartOnMac in
@@ -64,6 +67,7 @@ void sal_detail_initialize(int argc, char ** argv) {
close(fd);
}
#endif
+sal_initGlobalTimer();
#if HAVE_SYSLOG_H
const char *use_syslog = getenv("SAL_LOG_SYSLOG");
sal_use_syslog = use_syslog != NULL && !strcmp(use_syslog, "1");
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index c99036b..70512f2 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -23,6 +23,12 @@
#include
#include
#include
+#include
+#include
+
+#if defined(MACOSX)
+#include
+#endif
/* FIXME: detection should be done in configure script */
#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
@@ -33,20 +39,36 @@
#define HAS_ALTZONE 1
#endif
+#if defined(MACOSX)
+typedef sal_uInt64 osl_time_t;
+static double adjust_time_factor;
+#else
+#if defined(_POSIX_TIMERS)
+#define USE_CLOCK_GETTIME
+typedef struct timespec osl_time_t;
+#else
+typedef struct timeval osl_time_t;
+#endif
+#endif
+static osl_time_t startTime;
+
+
/*--
* osl_getSystemTime
*-*/
sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
{
+#if defined(MACOSX)
+double diff = (double)(mach_absolute_time() - startTime) *
adjust_time_factor;
+tv->Seconds = (sal_uInt32)diff;
+tv->Nanosec = (sal_uInt32)((diff - tv->Seconds) * 1e9);
+#else
int res;
-#if defined(LINUX)
-struct timespec tp;
-
+osl_time_t tp;
+#if defined(USE_CLOCK_GETTIME)
res = clock_gettime(CLOCK_REALTIME, &tp);
#else
-struct timeval tp;
-
res = gettimeofday(&tp, NULL);
#endif
@@ -56,12 +78,12 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
}
tv->Seconds = tp.tv_sec;
-#if defined(LINUX)
+#if defined(USE_CLOCK_GETTIME)
tv->Nanosec = tp.tv_nsec;
#else
tv->Nanosec = tp.tv_usec * 1000;
#endif
-
+#endif
return sal_True;
}
@@ -253,28 +275,55 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime(
TimeValue* pLocalTimeVal, Time
return sal_False;
}
-
-
-static struct timeval startTime;
-static sal_Bool bGlobalTimer = sal_False;
+void sal_initGlobalTimer()
+{
+#if defined(MACOSX)
+ mach_timebase_info_data_t timebase;
+ mach_timebase_info(&timebase);
+ adjust_time_factor = 1e-9 * (double)timebase.numer /
(double)(timebase.denom);
+ startTime = mach_absolute_time();
+#else /* NDef MACOSX */
+ int res;
+#if defined(USE_CLOCK_GETTIME)
+ res = clock_gettime(CLOCK_REALTIME, &startTime);
+#else /* Ndef USE_CLOCK_GETTIME */
+ res = gettimeofday( &startTime, NULL );
+#endif /* NDef USE_CLOCK_GETTIME */
+ assert(res == 0);
+#endif /* NDef MACOSX */
+}
sal_uInt32 SAL_CALL osl_getGlobalTimer()
{
- struct timeval currentTime;
- sal_uInt32 nSeconds;
+sal_uInt32 nSeconds;
- // FIXME: not thread safe !!
- if ( bGlobalTimer == sal_False )
- {
- gettimeofday( &startTime, NULL );
- bGlobalTimer=sal_True;
- }
+#if defined(MACOSX)
+startTime = mach_absolute_time();
- gettimeofday( ¤tTime, NULL );
+double diff = (double)(mach_absolute_time() - startTime) *
adjust_time_factor * 1000;
+nSeconds = (sal_uInt32)diff;
+#else
+osl_time_t currentTime;
+int res;
- nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
+#if defined(USE_CLOCK_GETTIME)
+res = clock_gettime(CLOCK_REALTIME, &startTime);
+#else
+res = gettimeofday( &startTime, NULL );
+#endif
+assert(res == 0);
+
+if (res != 0)
+return 0;
- return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec -
startTime.tv_usec) / 1000 );
+nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
+#if defined(USE_CLOCK_GETTIME)
+nSeconds = ( nSeconds * 1000 ) + (long) (( currentTime.tv_nsec -
startTime.tv_nsec) / 100 );
+#else
+nSeconds = ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec -
startTime.tv_usec) / 1000 );
+#endif
+#endif
+return nSeconds;
}
[PATCH] AppendAscii cleanup
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3974
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3974/1
AppendAscii cleanup
Change-Id: I7398272de0bd340ebfb5f31b314d32fcff007eec
---
M extensions/source/bibliography/datman.cxx
M extensions/source/dbpilots/listcombowizard.cxx
M extensions/source/propctrlr/browserline.cxx
M extensions/source/scanner/sanedlg.cxx
M linguistic/source/convdiclist.cxx
M padmin/source/helper.cxx
M sc/inc/editutil.hxx
M sc/source/core/tool/editutil.cxx
M sc/source/core/tool/interpr1.cxx
M sc/source/filter/dif/difimp.cxx
M sc/source/filter/excel/excrecds.cxx
M sc/source/filter/excel/xehelper.cxx
M sc/source/filter/inc/excrecds.hxx
M sc/source/ui/app/inputhdl.cxx
14 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/extensions/source/bibliography/datman.cxx
b/extensions/source/bibliography/datman.cxx
index f4cfa2b..4fdf310 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -178,9 +178,8 @@
catch (const Exception& e)
{
#ifdef DBG_UTIL
-String sMsg(OUString("::getColumns : catched an exception ("));
-sMsg += String(e.Message);
-sMsg.AppendAscii(") ...");
+OUString sMsg( "::getColumns : catched an exception (" +
e.Message + ") ..." );
+
OSL_FAIL(OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US
).getStr());
#else
(void)e;
diff --git a/extensions/source/dbpilots/listcombowizard.cxx
b/extensions/source/dbpilots/listcombowizard.cxx
index eea2913..866a34e 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -184,13 +184,9 @@
getContext().xObjectModel->setPropertyValue(OUString("BoundColumn"),
makeAny((sal_Int16)1));
// build the statement to set as list source
-String sStatement;
-sStatement.AppendAscii("SELECT ");
-sStatement += getSettings().sListContentField;
-sStatement.AppendAscii(", ");
-sStatement += getSettings().sLinkedListField;
-sStatement.AppendAscii(" FROM ");
-sStatement += getSettings().sListContentTable;
+OUString sStatement = "SELECT " +
+OUString( getSettings().sListContentField ) + ", " +
OUString( getSettings().sLinkedListField ) +
+" FROM " + OUString( getSettings().sListContentTable );
Sequence< OUString > aListSource(1);
aListSource[0] = sStatement;
getContext().xObjectModel->setPropertyValue(OUString("ListSource"),
makeAny(aListSource));
@@ -198,12 +194,10 @@
else
{
// build the statement to set as list source
-String sStatement;
-sStatement.AppendAscii("SELECT DISTINCT ");
-sStatement += getSettings().sListContentField;
-sStatement.AppendAscii(" FROM ");
-sStatement += getSettings().sListContentTable;
-
getContext().xObjectModel->setPropertyValue(OUString("ListSource"),
makeAny(OUString(sStatement)));
+OUString sStatement = "SELECT DISTINCT " +
+OUString( getSettings().sListContentField ) +
+" FROM " + OUString( getSettings().sListContentTable );
+getContext().xObjectModel->setPropertyValue( "ListSource",
makeAny(OUString(sStatement)));
}
// the bound field
diff --git a/extensions/source/propctrlr/browserline.cxx
b/extensions/source/propctrlr/browserline.cxx
index a8ec00c..37e9a74 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -275,16 +275,16 @@
{
if( m_pTheParent )
{
-String aText = m_aFtTitle.GetText();
+OUString aText( m_aFtTitle.GetText() );
while( m_pTheParent->GetTextWidth( aText ) < m_nNameWidth )
-aText.AppendAscii("...");
+aText += "...";
// for Issue 69452
if (Application::GetSettings().GetLayoutRTL())
{
sal_Unicode cRTL_mark = 0x200F;
-aText.Append(cRTL_mark);
+aText += OUString( cRTL_mark );
}
m_aFtTitle.SetText(aText);
diff --git a/extensions/source/scanner/sanedlg.cxx
b/extensions/source/scanner/sanedlg.cxx
index 2ccd4d9..f0b31c6 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1244,8 +1244,14 @@
return;
const char* pEnv = getenv( "HOME" );
-String aFileName( pEnv ? pEnv : "", osl_getThreadTextEncoding() );
-aFileName.AppendAscii( "/.so_sane_state"
[PUSHED] Thread-safe version of osl_getGlobalTime
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3960 Approvals: LibreOffice gerrit bot: Verified Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3960 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d Gerrit-PatchSet: 11 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: lcms2/ExternalPackage_lcms2.mk
lcms2/ExternalPackage_lcms2.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 316850f0f17af2fd2a779f7de66bee50a9605d31 Author: Matúš Kukan Date: Mon May 20 12:26:26 2013 +0200 Create liblcms2.so.2 as a real library in solver. There was just a broken symbolic link liblcms2.so.2 -> liblcms2.so.2.0.4 in installation. Change-Id: If7425131373a6521e802c85d53fbee6a792b1604 Reviewed-on: https://gerrit.libreoffice.org/3973 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 790c590..b5cd180 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -27,8 +27,7 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin endif else $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) -# NOTE: this is a symlink -$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2)) +$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4)) endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 61186, which changed state. Bug 61186 Summary: Print dialog ignores saved settings from Printer Settings + more https://bugs.freedesktop.org/show_bug.cgi?id=61186 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jean-Baptiste Faure changed: What|Removed |Added Depends on||64751, 64685 --- Comment #19 from Jean-Baptiste Faure --- Added 2 very visible bugs: bug 64685 : superscript broken, gives subscript instead, even in auto-correction bug 64751 : Header & footer blue tags empty (no visible text) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Create liblcms2.so.2 as a real library in solver.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3973 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3973 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7425131373a6521e802c85d53fbee6a792b1604 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/sal sfx2/source
include/sal/log-areas.dox|1 +
sfx2/source/sidebar/ContextChangeBroadcaster.cxx |1 -
sfx2/source/sidebar/SidebarController.cxx|1 -
3 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit e53e7934da35c793222a9f048225b893450ab01b
Author: Tor Lillqvist
Date: Mon May 20 13:55:41 2013 +0300
WaE: unused variable 'aWindowPosition'
Change-Id: I6db9f3848d6d786dbf60bd5b0b250b0c9e447ad7
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index c4ea537..188afc5 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1036,7 +1036,6 @@ sal_Int32 SidebarController::SetChildWindowWidth (const
sal_Int32 nNewWidth)
const long nColumnWidth (pSplitWindow->GetLineSize(nColumn));
Window* pWindow = mpParentWindow;
-const Point aWindowPosition (pWindow->GetPosPixel());
const Size aWindowSize (pWindow->GetSizePixel());
pSplitWindow->MoveWindow(
commit 30cb1a737dc42321da01ed1f091eca0caef1c91a
Author: Tor Lillqvist
Date: Mon May 20 13:54:52 2013 +0300
Fix warning: unknown log area 'svtools' [loplugin]
Change-Id: I7d67464fc3b2e9c4e7c7ea05bb1bbfa1267cb757
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b819684..bee62d6 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -195,6 +195,7 @@ certain functionality.
@section svtools
+@li @c svtools
@li @c svtools.config
@li @c svtools.contnr
@li @c svtools.control
commit 77f6bb7a5d5840375ed5a0c44fd354fb6ed41cb4
Author: Tor Lillqvist
Date: Mon May 20 13:53:11 2013 +0300
Fix warning: unused variable 'sModuleName' [loplugin]
Change-Id: Ifa4dc5d704e4452824445d9652e135ddb6cb61e6
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 463d151..7d5dd3a 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -113,7 +113,6 @@ OUString ContextChangeBroadcaster::GetModuleName (const
cssu::ReferencegetController().is())
return OUString();
-OUString sModuleName;
try
{
const ::comphelper::ComponentContext aContext
(::comphelper::getProcessServiceFactory());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/debug/ColorPanel.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 905d75bf2c337b7cb190f1c87d7bda2f4fa4e7e7 Author: Tor Lillqvist Date: Mon May 20 14:08:32 2013 +0300 WaE: private field 'mnPreferredColumnCount' is not used Change-Id: Ife3d5b26b1f8f1c41d681aa3543ddc3813779a6b diff --git a/svx/source/sidebar/debug/ColorPanel.hxx b/svx/source/sidebar/debug/ColorPanel.hxx index 5f7887a..2a53e24 100644 --- a/svx/source/sidebar/debug/ColorPanel.hxx +++ b/svx/source/sidebar/debug/ColorPanel.hxx @@ -40,8 +40,6 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent); private: -int mnPreferredColumnCount; - /** Depending on the given number of columns and the item size calculate the number of rows that are necessary to display all items. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/debug/ColorPanel.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 51207ddd4c956f9740d6ec5bcb91d9e0756af0b6
Author: Tor Lillqvist
Date: Mon May 20 14:10:44 2013 +0300
No 'mnPreferredColumnCount' any more
Change-Id: I0dfebc75b94b1be723ecc5e58d3a0227415b3121
diff --git a/svx/source/sidebar/debug/ColorPanel.cxx
b/svx/source/sidebar/debug/ColorPanel.cxx
index 57cce20..94d082f 100644
--- a/svx/source/sidebar/debug/ColorPanel.cxx
+++ b/svx/source/sidebar/debug/ColorPanel.cxx
@@ -24,8 +24,7 @@
namespace svx { namespace sidebar {
ColorPanel::ColorPanel (::Window* pParent)
-: ValueSet(pParent, WB_ITEMBORDER),
- mnPreferredColumnCount(2)
+: ValueSet(pParent, WB_ITEMBORDER)
{
WinBits aStyle =
WB_ITEMBORDER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl svtools/source toolkit/source vcl/source
include/vcl/combobox.hxx |2 +-
svtools/source/brwbox/ebbcontrols.cxx |4 ++--
toolkit/source/awt/vclxtoolkit.cxx|4 ++--
vcl/source/control/combobox.cxx |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 662d96bc6260e2453a386021dbcfcc6c85ec3778
Author: Michael Meeks
Date: Mon May 20 12:15:51 2013 +0100
vcl: all EnableAutoSize methods take a bool.
Change-Id: I6f974d6b82f6bb77996d20219b5c0ceb78596c5c
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 1fcfe31..aa19e9c 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -120,7 +120,7 @@ public:
voidSetDropDownLineCount( sal_uInt16 nLines );
sal_uInt16 GetDropDownLineCount() const;
-voidEnableAutoSize( sal_Bool bAuto );
+voidEnableAutoSize( bool bAuto );
sal_BoolIsAutoSizeEnabled() const { return
mbDDAutoSize; }
voidEnableDDAutoWidth( sal_Bool b );
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 022bc73..7e68ebf 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -44,7 +44,7 @@ namespace svt
ComboBoxControl::ComboBoxControl(Window* pParent, WinBits nWinStyle)
:ComboBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER)
{
-EnableAutoSize(sal_False);
+EnableAutoSize(false);
EnableAutocomplete(sal_True);
SetDropDownLineCount(5);
}
@@ -151,7 +151,7 @@ namespace svt
ListBoxControl::ListBoxControl(Window* pParent, WinBits nWinStyle)
:ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER)
{
-EnableAutoSize(sal_False);
+EnableAutoSize(false);
EnableMultiSelection(sal_False);
SetDropDownLineCount(20);
}
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 271ec31..21c5b6d 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -634,7 +634,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow**
ppNewComp,
break;
case WINDOW_COMBOBOX:
pNewWindow = new ComboBox( pParent, nWinBits|WB_AUTOHSCROLL );
-((ComboBox*)pNewWindow)->EnableAutoSize( sal_False );
+((ComboBox*)pNewWindow)->EnableAutoSize( false );
*ppNewComp = new VCLXComboBox;
break;
case WINDOW_CURRENCYBOX:
@@ -722,7 +722,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow**
ppNewComp,
break;
case WINDOW_LISTBOX:
pNewWindow = new ListBox( pParent,
nWinBits|WB_SIMPLEMODE|WB_AUTOHSCROLL );
-((ListBox*)pNewWindow)->EnableAutoSize( sal_False );
+((ListBox*)pNewWindow)->EnableAutoSize( false );
*ppNewComp = new VCLXListBox;
break;
case WINDOW_LONGCURRENCYBOX:
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 425bd5e..5234a52 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -531,7 +531,7 @@ void ComboBox::DoubleClick()
// ---
-void ComboBox::EnableAutoSize( sal_Bool bAuto )
+void ComboBox::EnableAutoSize( bool bAuto )
{
mbDDAutoSize = bAuto;
if ( mpFloatWin )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basic/source svx/source
basic/source/runtime/methods.cxx |2 +-
svx/source/sidebar/text/SvxSBFontNameBox.cxx |1 -
svx/source/sidebar/text/SvxSBFontNameBox.hxx |1 -
3 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 175509176433cf5df2d98718e1a6f9cf5bbe9658
Author: Noel Power
Date: Mon May 20 09:56:26 2013 +0100
fix wildcard handling regression( for basic functions like Dir ) fdo#64536
Tweak another fallout from String->OUString
Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ff85d10..2fd3eb5 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2619,7 +2619,7 @@ OUString implSetupWildcard( const OUString& rFileParam,
SbiRTLData* pRTLData )
// Is there a pure file name left? Otherwise the path is
// invalid anyway because it was not accepted by OSL before
-if (string::equals(aPureFileName, '*'))
+if (!string::equals(aPureFileName, '*'))
{
pRTLData->pWildCard = new WildCard( aPureFileName );
}
commit d7f93b544de67218659bc07bb54adc04f94769a6
Author: Tor Lillqvist
Date: Mon May 20 14:19:06 2013 +0300
WaE: private field 'bInput' is not used
Change-Id: I0a220120e312b901549f7243c0d1bf750a1227a1
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index c60ece6..1137617 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -87,7 +87,6 @@ SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent, const
ResId& rResId ) :
FontNameBox ( pParent, rResId )
, pFontList ( NULL )
, nFtCount( 0 )
-, bInput(false)
, pBindings(NULL)
{
EnableControls_Impl();
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index 65fcc10..82289e3 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -52,7 +52,6 @@ private:
FontaCurFont;
String aCurText;
sal_uInt16 nFtCount;
-bool bInput;
voidEnableControls_Impl();
SfxBindings*pBindings;//
protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fix wildcard handling regression( for basic functions like D...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3975
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/3975/1
fix wildcard handling regression( for basic functions like Dir ) fdo#64536
Tweak another fallout from String->OUString
Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd
(cherry picked from commit 175509176433cf5df2d98718e1a6f9cf5bbe9658)
---
M basic/source/runtime/methods.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 666dbba..489f996 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2586,7 +2586,7 @@
// Is there a pure file name left? Otherwise the path is
// invalid anyway because it was not accepted by OSL before
-if (string::equals(aPureFileName, '*'))
+if (!string::equals(aPureFileName, '*'))
{
pRTLData->pWildCard = new WildCard( aPureFileName );
}
--
To view, visit https://gerrit.libreoffice.org/3975
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - include/svx svx/source
include/svx/sidebar/ColorControl.hxx |1 -
svx/source/sidebar/line/LinePropertyPanel.cxx | 23 ---
svx/source/sidebar/text/TextPropertyPanel.cxx |8
svx/source/sidebar/tools/ColorControl.cxx |3 +--
4 files changed, 1 insertion(+), 34 deletions(-)
New commits:
commit 08a7b542533d8de0a8fde5c2e836070b3c5592a3
Author: Tor Lillqvist
Date: Mon May 20 14:27:36 2013 +0300
WaE: unused parameter 'pBindings'
Change-Id: I4569c83fad5974d95f667e6ddd40648e4951e10f
diff --git a/svx/source/sidebar/tools/ColorControl.cxx
b/svx/source/sidebar/tools/ColorControl.cxx
index a943d2e..ba43c0f 100644
--- a/svx/source/sidebar/tools/ColorControl.cxx
+++ b/svx/source/sidebar/tools/ColorControl.cxx
@@ -85,7 +85,7 @@ namespace {
ColorControl::ColorControl (
Window* pParent,
-SfxBindings* pBindings,
+SfxBindings* /* pBindings */,
const ResId& rControlResId,
const ResId& rValueSetResId,
const ::boost::function& rNoColorGetter,
commit a6e8a1def65ea8f12662c3e295590d6cc59ea4a8
Author: Tor Lillqvist
Date: Mon May 20 14:26:18 2013 +0300
WaE: private field 'mpBindings' is not used
Change-Id: I58cb45ac54b54f9c0f65640dfad05185b2c01b16
diff --git a/include/svx/sidebar/ColorControl.hxx
b/include/svx/sidebar/ColorControl.hxx
index 606a906..6f8faf7 100644
--- a/include/svx/sidebar/ColorControl.hxx
+++ b/include/svx/sidebar/ColorControl.hxx
@@ -69,7 +69,6 @@ public:
const bool bAvl);
private:
-SfxBindings* mpBindings;
SvxColorValueSet maVSColor;
FloatingWindow* mpFloatingWindow;
const String msNoColorString;
diff --git a/svx/source/sidebar/tools/ColorControl.cxx
b/svx/source/sidebar/tools/ColorControl.cxx
index 3a517b9..a943d2e 100644
--- a/svx/source/sidebar/tools/ColorControl.cxx
+++ b/svx/source/sidebar/tools/ColorControl.cxx
@@ -93,7 +93,6 @@ ColorControl::ColorControl (
FloatingWindow* pFloatingWindow,
const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId)
: PopupControl(pParent, rControlResId),
- mpBindings(pBindings),
maVSColor(this, rValueSetResId),
mpFloatingWindow(pFloatingWindow),
msNoColorString(
commit 061030bb26cf17daffaf384b2de0a7446ba172f5
Author: Tor Lillqvist
Date: Mon May 20 14:24:43 2013 +0300
WaE: unused function 'GetItemId_Impl_line'
Change-Id: Icc8ff462995491d153532eeb0218c2cac480511e
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 071f4ec..915d48b 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -60,29 +60,6 @@ using ::sfx2::sidebar::Theme;
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
namespace {
-short GetItemId_Impl_line( ValueSet& rValueSet, const Color& rCol )
-{
-if(rCol == COL_AUTO)
-return 0;
-
-boolbFound = false;
-sal_uInt16 nCount = rValueSet.GetItemCount();
-sal_uInt16 n = 1;
-
-while ( !bFound && n <= nCount )
-{
-Color aValCol = rValueSet.GetItemColor(n);
-
-bFound = ( aValCol.GetRed() == rCol.GetRed()
-&& aValCol.GetGreen() == rCol.GetGreen()
-&& aValCol.GetBlue() == rCol.GetBlue() );
-
-if ( !bFound )
-n++;
-}
-return bFound ? n : -1;
-}
-
void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd,
const XLineEndList& rList)
{
const sal_uInt32 nCount(rList.Count());
commit f160e4935c474a5293b3d3c11b3d538efb4767a0
Author: Tor Lillqvist
Date: Mon May 20 14:23:54 2013 +0300
WaE: unused function 'GetAutomaticColor'
Change-Id: I247d8e0fbfa8c050806a08d2e387d9bc761de534
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 53ec527..6547db6 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -80,14 +80,6 @@ PopupControl* TextPropertyPanel::CreateUnderlinePopupControl
(PopupContainer* pP
return new TextUnderlineControl(pParent, *this, mpBindings);
}
-namespace
-{
-Color GetAutomaticColor(void)
-{
-return COL_AUTO;
-}
-} // end of anonymous namespace
-
long TextPropertyPanel::GetSelFontSize()
{
long nH = 240;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svx/source
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |2 --
svx/source/sidebar/tools/ValueSetWithTextControl.cxx |3 ---
2 files changed, 5 deletions(-)
New commits:
commit bee150931d4913edbc0f8cdc3854c2699ebdde46
Author: Tor Lillqvist
Date: Mon May 20 14:35:14 2013 +0300
WaE: macro is not used
Change-Id: I1f88819c85f0c0539bfa3b48ffc215e279c007d0
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index df1bc7d..91a1848 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -48,8 +48,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::style;
using rtl::OUString;
-#define C2U(cChar) OUString::createFromAscii(cChar)
-
namespace svx { namespace sidebar {
static const sal_Char cValue[] = "Value";
commit b9c661e2bb4c521e5e71150f9b52272eb05aa9b7
Author: Tor Lillqvist
Date: Mon May 20 14:34:47 2013 +0300
Fix warnings: unused variables [loplugin]
Change-Id: Id5c62c21f65165085616390d24605efe35ca9924
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index a3aafaa..fdba30f 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1070,7 +1070,6 @@ void PosSizePropertyPanel::executePosX()
lX = -lX;
long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
-Size aPageSize;
Rectangle aRect;
maRect = mpView->GetAllMarkedRect();
aRect = mpView->GetAllMarkedRect();
@@ -1098,7 +1097,6 @@ void PosSizePropertyPanel::executePosY()
long lX = GetCoreValue( *mpMtrPosX, mePoolUnit );
long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
-Size aPageSize;
Rectangle aRect;
maRect = mpView->GetAllMarkedRect();
aRect = mpView->GetAllMarkedRect();
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 3489a53..df1bc7d 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -344,7 +344,6 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent&
rUDEvt )
pDev->DrawOutDev( aRect.TopLeft(), aRectSize,
aOrgRect.TopLeft(), aRectSize,
*pVDev );
-const OUString sValue(C2U(cValue));
Point aStart(aBLPos.X() + nRectWidth / 9,0);
if ( nItemId == DEFAULT_NONE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] masterlayoutdlg.ui widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3976 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3976/1 masterlayoutdlg.ui widget Change-Id: Ic49c2519b5949661a13f8a24c2c4a084242b1882 --- A sd/uiconfig/simpress/ui/masterlayoutdlg.ui 1 file changed, 173 insertions(+), 0 deletions(-) diff --git a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui new file mode 100644 index 000..d7d5f10 --- /dev/null +++ b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui @@ -0,0 +1,173 @@ + + + + +False +6 +Master Elements +dialog + + +False +vertical +2 + + +False +spread + + +gtk-ok +True +True +True +True +False +True + + +False +True +0 + + + + +gtk-cancel +True +True +True +False +True + + +False +True +1 + + + + +False +True +end +0 + + + + +True +False +0 +none + + +True +False +6 +12 + + +True +False +vertical + + +_Header +True +True +False +False +True +0 +True + + +False +True +0 + + + + +_Date/time +True +True +False +False +True +0 +True + + +False +True +1 + + + + +_Footer +True +True +False +False +True +0 +True + + +False +True +2 + + + + +_Page number +True +True +False +False +True +0 +True + + +False +True +3 + + + + + + + + +True +False +Placeholders +True + + +Placeholders + + + + + + +False +True +1 + + + + + + ok1 + cancel1 + + + -- To view, visit https://gerrit.libreoffice.org/3976 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic49c2519b5949661a13f8a24c2c4a084242b1882 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appserv.cxx | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
New commits:
commit e58b0ce9ccb531b01298bfb18cbeb042892efc92
Author: Michael Meeks
Date: Mon May 20 12:48:01 2013 +0100
fdo#48775 - presumed fix for missing bibliography database exception crash.
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c80b4d4..80a380f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -171,7 +171,7 @@ namespace
SolarMutexGuard aGuard;
executeRestartDialog(comphelper::getProcessComponentContext(),
NULL, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
}
-catch (Exception & e)
+catch (const Exception & e)
{
SAL_INFO(
"sfx2.appl",
@@ -179,10 +179,19 @@ namespace
}
return;
}
-SfxStringItem aURL(SID_FILE_NAME,
OUString(".component:Bibliography/View1"));
-SfxStringItem aRef(SID_REFERER, OUString("private:user"));
-SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
-SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC,
SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
+
+try // fdo#48775
+{
+SfxStringItem aURL(SID_FILE_NAME,
OUString(".component:Bibliography/View1"));
+SfxStringItem aRef(SID_REFERER, OUString("private:user"));
+SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
+SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC,
SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
+}
+catch (const Exception & e)
+{
+SAL_INFO( "sfx2.appl",
+ "trying to load bibliography database, caught " <<
e.Message);
+}
}
}
/// Find the correct location of the document (LICENSE.odt, etc.), and return
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/download-stats.pl
scripts/download-stats.pl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7f1f81ff95047a7af3621f46ae072df83990ce38
Author: Jan Holesovsky
Date: Mon May 20 13:46:51 2013 +0200
First update, then collect the filenames.
diff --git a/scripts/download-stats.pl b/scripts/download-stats.pl
index 3e128e0..bbe2db0 100755
--- a/scripts/download-stats.pl
+++ b/scripts/download-stats.pl
@@ -64,7 +64,7 @@ sub find_logs($)
my @logfiles;
if (-f $path ) {
- if ($path =~ m/documentfoundation\.org.*access_log/) {
+ if ($path =~ m/documentfoundation\.org.*-access_log/) {
if ($verbose) {
print STDERR "hit: $path\n";
}
@@ -441,17 +441,17 @@ if (!defined $path_to_log_tree) {
$path_to_log_tree = "$path_to_log_tree/downloads";
}
-my @log_filenames = find_logs ($path_to_log_tree);
-if ($verbose) {
-print STDERR "Have log paths of:\n\t" . (join("\n\t", @log_filenames)) .
"\n";
-}
-
# update first
if ($rsync_first) {
system('rsync --delete -av
bilbo.documentfoundation.org:/var/log/apache2/download.documentfoundation.org/
downloads/download.documentfoundation.org/ 1>&2');
system('rsync --delete -av
bilbo.documentfoundation.org:/var/log/apache2/downloadarchive.documentfoundation.org/
downloads/downloadarchive.documentfoundation.org/ 1>&2');
}
+my @log_filenames = find_logs ($path_to_log_tree);
+if ($verbose) {
+print STDERR "Have log paths of:\n\t" . (join("\n\t", @log_filenames)) .
"\n";
+}
+
# the slow piece - parsing the logs
my $files_in = @log_filenames;
my $parallel = $cpus_to_use;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 48775, which changed state. Bug 48775 Summary: CRASH when opening biblio.odb via tools menu without Base module installed https://bugs.freedesktop.org/show_bug.cgi?id=48775 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sfx2/source
sfx2/source/sidebar/TitleBar.cxx |2 --
sfx2/source/view/viewfrm.cxx |2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 1c05b867ef9e2b83f4f91586b889674226b6a7c3
Author: Tor Lillqvist
Date: Mon May 20 14:45:25 2013 +0300
WaE: 'e' : unreferenced local variable
Change-Id: I4e67dece0ead3097eb945d8f67795d93b8595eb1
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 219f5dc..e857318 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3415,7 +3415,7 @@ bool SfxViewFrame::IsSidebarEnabled()
xContext = ::comphelper::getProcessComponentContext();
try {
bEnabled =
officecfg::Office::Common::Misc::ExperimentalSidebar::get( xContext );
-} catch (const uno::Exception &e) {
+} catch (const uno::Exception &) {
SAL_WARN("sfx2.view", "don't have experimental sidebar option
installed");
}
commit 9d9878f839a86f3d01400f42ce95bef9f8a162b7
Author: Tor Lillqvist
Date: Mon May 20 14:42:53 2013 +0300
Fix warning C4273: 'ToolbarValue::~ToolbarValue' : inconsistent dll linkage
That destructor is defined in vcl/source/gdi/outdevnative.cxx anyway.
(As empty there, too.) What is going on here?
Change-Id: Id27f07d47d819a4eaf272819a2e058f5f930b7be
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index 76bf7d7..2240006 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -23,8 +23,6 @@
#include
#include
-ToolbarValue::~ToolbarValue (void) {}
-
namespace
{
const static sal_Int32 gnLeftIconSpace (3);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59516, which changed state. Bug 59516 Summary: FILEOPEN: Native MySQL-connector couldnt be installed under Windows in LO 4.0 https://bugs.freedesktop.org/show_bug.cgi?id=59516 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Wizard Integration
hi, still having problems with wizard integration, now i notice that after a make dev-install there is no code of my wizard in "install/program/wizards/" best regards jorge luis - Mensaje original - De: "Stephan Bergmann" Para: "Jorge Luis Roque Alvarez" CC: libreoffice@lists.freedesktop.org Enviados: Miércoles, 8 de Mayo 2013 4:32:46 Asunto: Re: Wizard Integration On 05/02/2013 05:49 PM, Jorge Luis Roque Alvarez wrote: > Sorry, to bother you again, once i run "make dev-install" i get this > > cannot process > /mnt/Work/LOGIT/core/solver/unxlngi6.pro/xml/component/wizards/com/sun/star/wizards/calendar/calendar.component > make[1]: *** [/mnt/Work/LOGIT/core/workdir/unxlngi6.pro/Rdb/services.rdb] > Error 10 > make[1]: *** Se borra el archivo > «/mnt/Work/LOGIT/core/workdir/unxlngi6.pro/Rdb/services.rdb» > make[1]: *** Se espera a que terminen otras tareas > make: *** [build] Error 2 In your new wizards/Jar_calendar.mk (or whatever you called it), do you have a gb_Jar_set_componentfile line (similar to the one in wizards/Jar_web.mk)? That should cause the generation of the presumably-missing-above /mnt/Work/LOGIT/core/solver/unxlngi6.pro/xml/component/wizards/com/sun/star/wizards/calendar/calendar.component from your new calendar.component file. Stephan > Here is a description of the steps i follow before running make dev-install > > 1- Edit the file officecfg/registry/data/org/openoffice/Office/Common.xcu, > here i include my code within the Wizard space: > > > > >service:com.sun.star.wizards.calendar.CallWizard?insert > > >~Calendar... > > >_self > > >private:image/3216 > > > > 2- Then on wizards/com/sun/star/wizards/ put the source of my wizard wich is > call calendar and rewrite the my component calendar.component: > > xmlns="http://openoffice.org/2010/uno-components";> >name="com.sun.star.wizards.calendar.CallWizard$WizardImplementation"> > > > > > 3- Include it in postprocess/Rdb_services.mk, right below this line > "wizards/com/sun/star/wizards/web/web \" i put mine > "wizards/com/sun/star/wizards/calendar/calendar \" > > 4- In wizards/com/sun/star/wizards/calendar/CallWizard.java i call my wizard. http://www.uci.cu http://www.uci.cu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sal/osl
sal/osl/unx/time.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit e913d2865521c56b15d22d42d24191c5d19e6ca4
Author: Tor Lillqvist
Date: Mon May 20 15:57:22 2013 +0300
Also iOS has tm_gmtoff
Change-Id: Ic0f883672b4bde3142ac257a57464bdbb90df96b
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index 3971664..94a935e 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -31,7 +31,7 @@
#endif
/* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
+#if defined(MACOSX) || defined(IOS) || defined(FREEBSD) || defined(NETBSD) || \
defined(LINUX) || defined(OPENBSD) || defined(DRAGONFLY)
#define STRUCT_TM_HAS_GMTOFF 1
commit beeedfd818d230ea6bc16c514a97910eaa518580
Author: Tor Lillqvist
Date: Mon May 20 15:56:24 2013 +0300
iOS is based on Mach, too
Change-Id: I9b6bdc374c9e92af754094f31e1ff212fb386f9e
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index 70512f2..3971664 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -26,7 +26,7 @@
#include
#include
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
#include
#endif
@@ -39,7 +39,7 @@
#define HAS_ALTZONE 1
#endif
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
typedef sal_uInt64 osl_time_t;
static double adjust_time_factor;
#else
@@ -59,7 +59,7 @@ static osl_time_t startTime;
sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
{
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
double diff = (double)(mach_absolute_time() - startTime) *
adjust_time_factor;
tv->Seconds = (sal_uInt32)diff;
tv->Nanosec = (sal_uInt32)((diff - tv->Seconds) * 1e9);
@@ -277,12 +277,12 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime(
TimeValue* pLocalTimeVal, Time
void sal_initGlobalTimer()
{
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
mach_timebase_info_data_t timebase;
mach_timebase_info(&timebase);
adjust_time_factor = 1e-9 * (double)timebase.numer /
(double)(timebase.denom);
startTime = mach_absolute_time();
-#else /* NDef MACOSX */
+#else /* ! (MACOSX || IOS) */
int res;
#if defined(USE_CLOCK_GETTIME)
res = clock_gettime(CLOCK_REALTIME, &startTime);
@@ -290,14 +290,14 @@ void sal_initGlobalTimer()
res = gettimeofday( &startTime, NULL );
#endif /* NDef USE_CLOCK_GETTIME */
assert(res == 0);
-#endif /* NDef MACOSX */
+#endif /* ! (MACOSX || IOS) */
}
sal_uInt32 SAL_CALL osl_getGlobalTimer()
{
sal_uInt32 nSeconds;
-#if defined(MACOSX)
+#if defined(MACOSX) || defined(IOS)
startTime = mach_absolute_time();
double diff = (double)(mach_absolute_time() - startTime) *
adjust_time_factor * 1000;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Add logging to libreoffice
On Sun, 2013-05-19 at 21:37 +0200, Slimane OULAD NAOUI wrote: > hi, everybody, > > i am a new linux and libreoffice user. I want to add extension to > libreoffice to allow logging ( save trace of whole actions performed > on a session in a document). > > i have the idea to exploit the UndoManager to save trace on undo and > Redo of actions. Presumably you need to implement a XUndoManagerListener and connect it to the documents undomanager, here's a starbasic example http://forum.openoffice.org/en/forum/viewtopic.php?f=25&t=57068 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/sidebar/LayoutMenu.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit f247b4351a777fa4600a2b6e3795988800cb908e
Author: Tor Lillqvist
Date: Mon May 20 16:16:32 2013 +0300
WaE: unreachable code
Change-Id: I34414abe0375e003249ba271b24530f13016fa40
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 631635d..9aa5955 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -880,13 +880,6 @@ IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent*,
pEvent)
default:
return sal_False;
}
-
-const SfxSimpleHint* pSimpleHint = PTR_CAST(SfxSimpleHint, pEvent);
-if (pSimpleHint != NULL
-&& pSimpleHint->GetId() == SFX_HINT_DYING)
-{
-return sal_True;
-}
}
return sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#63035 Add "Match Case" to Find bar.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3977
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3977/1
fdo#63035 Add "Match Case" to Find bar.
Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4
---
M basctl/uiconfig/basicide/toolbar/findbar.xml
M include/svx/dialogs.hrc
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M sc/uiconfig/scalc/toolbar/findbar.xml
M sd/uiconfig/sdraw/toolbar/findbar.xml
M sd/uiconfig/simpress/toolbar/findbar.xml
M svx/inc/tbunosearchcontrollers.hxx
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
M svx/source/tbxctrls/tbunosearchcontrollers.src
M svx/source/unodraw/unoctabl.cxx
M svx/util/svx.component
M sw/uiconfig/sglobal/toolbar/findbar.xml
M sw/uiconfig/sweb/toolbar/findbar.xml
M sw/uiconfig/swriter/toolbar/findbar.xml
M sw/uiconfig/swxform/toolbar/findbar.xml
16 files changed, 300 insertions(+), 3 deletions(-)
diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml
b/basctl/uiconfig/basicide/toolbar/findbar.xml
index 42baa21..57aec06 100644
--- a/basctl/uiconfig/basicide/toolbar/findbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 339cba7..f9e7833 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -928,6 +928,7 @@
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
(RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START +
1190)
+#define RID_SVXSTR_FINDBAR_MATCHCASE(RID_SVX_START +
1192)
#define RID_SVXSTR_NEXTFREE (RID_SVX_START +
1191)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 56055d4..6fd5def 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -429,6 +429,17 @@
com.sun.star.svx.UpSearchToolboxController
+
+
+ .uno:MatchCase
+
+
+
+
+
+ com.sun.star.svx.MatchCaseToolboxController
+
+
.uno:FontColor
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 8ff9b74..b9e77a6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1470,6 +1470,11 @@
1
+
+
+ Match Case
+
+
Exit Search
diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml
b/sc/uiconfig/scalc/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sc/uiconfig/scalc/toolbar/findbar.xml
+++ b/sc/uiconfig/scalc/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml
b/sd/uiconfig/sdraw/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sd/uiconfig/sdraw/toolbar/findbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml
b/sd/uiconfig/simpress/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sd/uiconfig/simpress/toolbar/findbar.xml
+++ b/sd/uiconfig/simpress/toolbar/findbar.xml
@@ -22,6 +22,7 @@
+
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index 23eb22f..5a83776 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -215,6 +216,49 @@
Type meType;
};
+class MatchCaseToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+MatchCaseToolboxController( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
+~MatchCaseToolboxController();
+
+// XInterface
+virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+virtual void SAL_CALL acquire() throw ();
+virtual void SAL_CALL release() throw ();
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw( css::uno::RuntimeException );
+virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException );
+
+static OUString getImplementationName_S
[PATCH] Remove vertical whitespace for Tor's reading pleasure
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3978
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3978/1
Remove vertical whitespace for Tor's reading pleasure
Change-Id: I6dc1e2e29a0ee3dbbaec86b2d41855d204885adf
---
M sd/source/ui/toolpanel/LayoutMenu.cxx
1 file changed, 0 insertions(+), 92 deletions(-)
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx
b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 8f444a3..540a8fd 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -223,8 +223,6 @@
GetShellManager()->AddSubShell(SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this);
}
-
-
LayoutMenu::~LayoutMenu (void)
{
// Tell the shell factory that this object is no longer available.
@@ -240,17 +238,11 @@
mrBase.GetEventMultiplexer()->RemoveEventListener (aLink);
}
-
-
-
::std::auto_ptr LayoutMenu::CreateControlFactory (
ToolPanelViewShell& i_rPanelViewShell )
{
return ::std::auto_ptr(new
LayoutMenuRootFactory(i_rPanelViewShell));
}
-
-
-
AutoLayout LayoutMenu::GetSelectedAutoLayout (void)
{
@@ -266,9 +258,6 @@
return aResult;
}
-
-
-
/** The preferred size depends on the preferred number of columns, the
number of items, and the size of the items.
*/
@@ -281,9 +270,6 @@
(sal_uInt16)CalculateRowCount (aItemSize,mnPreferredColumnCount));
return aPreferredWindowSize;
}
-
-
-
sal_Int32 LayoutMenu::GetPreferredWidth (sal_Int32 nHeight)
{
@@ -304,9 +290,6 @@
return nPreferredWidth;
}
-
-
-
sal_Int32 LayoutMenu::GetPreferredHeight (sal_Int32 nWidth)
{
@@ -331,9 +314,6 @@
return nPreferredHeight;
}
-
-
-
sal_Int32 LayoutMenu::GetMinimumWidth (void)
{
sal_Int32 nMinimumWidth = 0;
@@ -346,16 +326,10 @@
return nMinimumWidth;
}
-
-
-
bool LayoutMenu::IsResizable (void)
{
return true;
}
-
-
-
void LayoutMenu::UpdateEnabledState (const MasterMode eMode)
{
@@ -422,16 +396,10 @@
}
}
-
-
-
::Window* LayoutMenu::GetWindow (void)
{
return this;
}
-
-
-
void LayoutMenu::Paint (const Rectangle& rRect)
{
@@ -446,9 +414,6 @@
SetBackground (Wallpaper());
}
-
-
-
void LayoutMenu::Resize (void)
{
@@ -479,9 +444,6 @@
ValueSet::Resize ();
}
-
-
-
void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent)
{
// As a preparation for the context menu the item under the mouse is
@@ -496,9 +458,6 @@
ValueSet::MouseButtonDown (rEvent);
}
-
-
-
void LayoutMenu::Execute (SfxRequest& rRequest)
{
@@ -517,9 +476,6 @@
}
}
-
-
-
void LayoutMenu::GetState (SfxItemSet& rItemSet)
{
// Cut and paste is not supported. The SID_(CUT,COPY,PASTE) entries
@@ -536,9 +492,6 @@
if (aState == SFX_ITEM_DISABLED)
rItemSet.DisableItem(SID_INSERTPAGE_LAYOUT_MENU);
}
-
-
-
void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout)
{
@@ -567,9 +520,6 @@
UpdateSelection();
}
-
-
-
TaskPaneShellManager* LayoutMenu::GetShellManager()
{
if ( mpShellManager )
@@ -588,9 +538,6 @@
Fill();
}
-
-
-
int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount)
{
int nRowCount = 0;
@@ -606,17 +553,11 @@
return nRowCount;
}
-
-
-
IMPL_LINK_NOARG(LayoutMenu, ClickHandler)
{
AssignLayoutToSelectedSlides (GetSelectedAutoLayout());
return 0;
}
-
-
-
/** The specified layout is assigned to the current page of the view shell
in the center pane.
@@ -707,9 +648,6 @@
while(false);
}
-
-
-
SfxRequest LayoutMenu::CreateRequest (
sal_uInt16 nSlotId,
AutoLayout aLayout)
@@ -746,9 +684,6 @@
return aRequest;
}
-
-
-
void LayoutMenu::Fill (void)
{
@@ -813,9 +748,6 @@
mbSelectionUpdatePending = true;
}
-
-
-
void LayoutMenu::Clear (void)
{
for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++)
@@ -823,30 +755,19 @@
ValueSet::Clear();
}
-
-
void LayoutMenu::StartDrag (sal_Int8 , const Point& )
{
}
-
-
-
sal_Int8 LayoutMenu::AcceptDrop (const AcceptDropEvent& )
{
return 0;
}
-
-
-
sal_Int8 LayoutMenu::ExecuteDrop (const ExecuteDropEvent& )
{
return 0;
}
-
-
-
void LayoutMenu::Command (const CommandEvent& rEvent)
{
@@ -891,17 +812,11 @@
}
}
-
-
-
IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler)
{
InvalidateContent();
return 0;
}
-
-
-
void LayoutMenu::UpdateSelection (void)
{
@@ -940,9 +855,6 @@
if ( ! bItemSelected)
SetNoSelection();
}
-
-
-
IMPL_LINK(LayoutMenu, EventMultiplexerListener,
::sd::tools::EventMultiplexerEvent*, pEvent)
{
@@ -987,15 +899,11 @@
return 0;
}
-
-
-
void LayoutMenu::DataChanged (const DataChangedEvent& rEvent)
{
Fill();
ValueSet::DataChanged(rEvent);
}
-
} } // end of namespace ::sd::toolpanel
--
To view, visit https://gerrit.libreoffice.org/3978
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Ge
[ABANDONED] Remove vertical whitespace for Tor's reading pleasure
Chris Sherlock has abandoned this change. Change subject: Remove vertical whitespace for Tor's reading pleasure .. Patch Set 1: Abandoned No need for this :-) Tor has it all under control -- To view, visit https://gerrit.libreoffice.org/3978 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6dc1e2e29a0ee3dbbaec86b2d41855d204885adf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Font family case-sensitiveness
On Sun, 2013-05-19 at 18:24 +0200, Thomas Arnhold wrote:
> Hi,
>
> A quick grep on the source reveals that there case-sensitive and
> case-insensitive comparisons for the font family name. This looks pretty
> suspicious.
>
> git grep -i \"starsymbol\" -- *.cxx
>
> Should we always check case-insensitive or convert all lower-case ones
> to "StarSymbol" (most/all? definitions of this string are mixed case).
We should probably always compare case-insensitivity, it can't really
hurt.
>
> The same holds for "opensymbol". Maybe more...
Nearly every (all?) place which tests for one or does something
dependent on one name will want to do the same thing for the other name.
So, a funny, I said to myself, "we should have a single thing like
IsStarSymbol and use it everywhere", did an opengrok for that, and we
already have *two* of those :-) one in vcl and one in writer. Looking at
the writer one I was reminded that in some places you can have
FONT;FALLBACK;OTHERFALLBACK as the fontname. I'm not sure if the other
various odd looking SearchAscii("StarSymbol") and startsWith tests are
because of that or because of some dev confusion. But a single
isStarSymbol based on the token splitting and case-insensitive compare
in writerhelper.cxx is likely safe everywhere.
> And maybe there is more work with GetFamilyName()..., see
> 79e5615fa103a52ce41ed682b624c13fd9a9d1eb.
Well, its kind of weird to have a test to see if the names are the same,
before going on to see if their foldedcase versions are the same too.
if( rFontName == GetFamilyName() ||
rFontName.equalsIgnoreAsciiCase( GetFamilyName() ) )
the OUString::equalsIgnoreAsciiCase does a (if both-share-the-ptr) opt
so I suggest you make those just into
if (rFontName.equalsIgnoreAsciiCase(GetFamilyName())) ?
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/miscdlgs/tabbgcolordlg.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 4e0625f4587658a4600e2992e2d7c6e77c1156b8
Author: Tor Lillqvist
Date: Mon May 20 15:04:47 2013 +0300
Fix warnings: unused variables [loplugin]
Change-Id: I50ff4a5bda413537d93002ef5dc6f90f139ae9de
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 9d1c9c6..e263368 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -98,8 +98,6 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
if ( pColorList.is() )
{
nColorCount = pColorList->Count();
-Color aColWhite( COL_WHITE );
-String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) );
aTabBgColorSet.addEntriesForXColorList(*pColorList);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] sal osl_getGlobalTimer: Don't confuse start and current time...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3979 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3979/1 sal osl_getGlobalTimer: Don't confuse start and current time. Change-Id: I575dd70d6b80d4f3279476037e509550cfa23fde --- M sal/osl/unx/time.c 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index 94a935e..227f502 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -298,8 +298,6 @@ sal_uInt32 nSeconds; #if defined(MACOSX) || defined(IOS) -startTime = mach_absolute_time(); - double diff = (double)(mach_absolute_time() - startTime) * adjust_time_factor * 1000; nSeconds = (sal_uInt32)diff; #else @@ -307,9 +305,9 @@ int res; #if defined(USE_CLOCK_GETTIME) -res = clock_gettime(CLOCK_REALTIME, &startTime); +res = clock_gettime(CLOCK_REALTIME, ¤tTime); #else -res = gettimeofday( &startTime, NULL ); +res = gettimeofday( ¤tTime, NULL ); #endif assert(res == 0); -- To view, visit https://gerrit.libreoffice.org/3979 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I575dd70d6b80d4f3279476037e509550cfa23fde Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mark Wielaard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - extras/source
extras/source/palettes/standard.soc | 228 +++- extras/source/palettes/standard.sog | 58 ++--- 2 files changed, 192 insertions(+), 94 deletions(-) New commits: commit 3cc0f7b992245b4bcc166fb15b0b8f76dda4f528 Author: Caolán McNamara Date: Mon May 20 13:09:17 2013 +0100 restore white next to black in the color palette drop-down i.e. restore e206f8b7a2882d7eea163e29d76dfb336113e3f7 Change-Id: I9c9647ae9e42bcb09a6acd8755bcb170006818f0 diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 49b0069..0a0988a 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -1,6 +1,7 @@ http://openoffice.org/2000/office"; xmlns:style="http://openoffice.org/2000/style"; xmlns:text="http://openoffice.org/2000/text"; xmlns:table="http://openoffice.org/2000/table"; xmlns:draw="http://openoffice.org/2000/drawing"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="http://openoffice.org/2000/meta"; xmlns:number="http://openoffice.org/2000/datastyle"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns:chart="http://openoffice.org/2000/chart"; xmlns:dr3d="http://openoffice.org/2000/dr3d"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="http://openoffice.org/2000/form"; xmlns:script="http://openoffice.org/2000/script";> + @@ -12,7 +13,6 @@ - commit 6c65af22ee54c8bc4f3a5031bea0af9ecd4f0f00 Author: Armin Le Grand Date: Mon Apr 8 11:51:43 2013 + Related: #i121520# changed a 2nd 'Blue 9' entry to 'Blue nine' to solve the conflict (cherry picked from commit 81c3404d82cb72b9d183e2b38034334e9b65fd22) Change-Id: Ic368478dac25d9dce8e7c80bd3a7a33fdc68f3b0 diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 7e1678ed..49b0069 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -148,7 +148,7 @@ - + commit efd10664b7808b531676cbbb402703bcc644b0d1 Author: Armin Le Grand Date: Wed Jan 2 08:55:58 2013 + Resolves: #i121520# changed basic color palette as described... in the task and discussed on the list under '[proposal] Adopt palette to Symphony palette partially', also corrected typos on gradient definitions (cherry picked from commit 57811cc1cd5e49c1e87fb2a9d79f8a3941a025e3) Conflicts: extras/source/palettes/standard.soc Change-Id: I54fa27963f7c9732211b7bded5a343b9c05449ab diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 6361f7b..7e1678ed 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -1,86 +1,156 @@ http://openoffice.org/2000/office"; xmlns:style="http://openoffice.org/2000/style"; xmlns:text="http://openoffice.org/2000/text"; xmlns:table="http://openoffice.org/2000/table"; xmlns:draw="http://openoffice.org/2000/drawing"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="http://openoffice.org/2000/meta"; xmlns:number="http://openoffice.org/2000/datastyle"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns:chart="http://openoffice.org/2000/chart"; xmlns:dr3d="http://openoffice.org/2000/dr3d"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="http://openoffice.org/2000/form"; xmlns:script="http://openoffice.org/2000/script";> - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -88,6 +158,8 @@ + + diff --git a/extras/source/palettes/standard.sog b/extras/source/palettes/standard.sog index 038843c..b3f4852 100644 --- a/extras/source/palettes/standard.sog +++ b/extras/source/palettes/standard.sog @@ -1,5 +1,4 @@ - http://openoffice.org/2000/office"; xmlns:style="http://openoffice.org/2000/style"; xmlns:text="http://openoffice.org/2000/
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 57/811cc1cd5e49c1e87fb2a9d79f8a3941a025e3 81/c3404d82cb72b9d183e2b38034334e9b65fd22
57/811cc1cd5e49c1e87fb2a9d79f8a3941a025e3 |1 + 81/c3404d82cb72b9d183e2b38034334e9b65fd22 |1 + 2 files changed, 2 insertions(+) New commits: commit c2c97a6303be78ef68617d81963951e357650fe8 Author: Caolán McNamara Date: Mon May 20 15:00:42 2013 +0100 Notes added by 'git notes add' diff --git a/57/811cc1cd5e49c1e87fb2a9d79f8a3941a025e3 b/57/811cc1cd5e49c1e87fb2a9d79f8a3941a025e3 new file mode 100644 index 000..e7df314 --- /dev/null +++ b/57/811cc1cd5e49c1e87fb2a9d79f8a3941a025e3 @@ -0,0 +1 @@ +merged as: efd10664b7808b531676cbbb402703bcc644b0d1 commit 7f3e42f8cef9ad2964329e9cfe273bd25061fcb4 Author: Caolán McNamara Date: Mon May 20 15:00:28 2013 +0100 Notes added by 'git notes add' diff --git a/81/c3404d82cb72b9d183e2b38034334e9b65fd22 b/81/c3404d82cb72b9d183e2b38034334e9b65fd22 new file mode 100644 index 000..4cc5a91 --- /dev/null +++ b/81/c3404d82cb72b9d183e2b38034334e9b65fd22 @@ -0,0 +1 @@ +merged as: 6c65af22ee54c8bc4f3a5031bea0af9ecd4f0f00 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 68/7205925cf94cff2daeb6e399ea7b05fd8213dd 75/3df696b003b6046a0444abc48a87e14de1ff33
68/7205925cf94cff2daeb6e399ea7b05fd8213dd |1 + 75/3df696b003b6046a0444abc48a87e14de1ff33 |1 + 2 files changed, 2 insertions(+) New commits: commit 8fb88cb7c441de8cf01c563d3445ccbe9795712a Author: Caolán McNamara Date: Mon May 20 15:01:08 2013 +0100 Notes added by 'git notes add' diff --git a/75/3df696b003b6046a0444abc48a87e14de1ff33 b/75/3df696b003b6046a0444abc48a87e14de1ff33 new file mode 100644 index 000..951fb47 --- /dev/null +++ b/75/3df696b003b6046a0444abc48a87e14de1ff33 @@ -0,0 +1 @@ +merged as: c117909c61683f697799dd55edb7b499310e32e8 commit cd86844cd95470f3a33f28c5315a29af5b787a80 Author: Caolán McNamara Date: Mon May 20 15:00:55 2013 +0100 Notes added by 'git notes add' diff --git a/68/7205925cf94cff2daeb6e399ea7b05fd8213dd b/68/7205925cf94cff2daeb6e399ea7b05fd8213dd new file mode 100644 index 000..dff182a --- /dev/null +++ b/68/7205925cf94cff2daeb6e399ea7b05fd8213dd @@ -0,0 +1 @@ +merged as: 3061fa41af3dd6d356fcbcd722c7a490d975eeb8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 73/9aa74697c7e6bd2954d80dce5dda99c6da40e5 a0/b26e586c25e5819ffb1eef78a5d7271d1273f5 f5/43dc75e285523c8da486d5462c1fa46ab66bb3
73/9aa74697c7e6bd2954d80dce5dda99c6da40e5 |1 + a0/b26e586c25e5819ffb1eef78a5d7271d1273f5 |1 + f5/43dc75e285523c8da486d5462c1fa46ab66bb3 |1 + 3 files changed, 3 insertions(+) New commits: commit 27d3c7388dfa7682693538ac9f4f9c0670844b8a Author: Caolán McNamara Date: Mon May 20 15:06:27 2013 +0100 Notes added by 'git notes add' diff --git a/f5/43dc75e285523c8da486d5462c1fa46ab66bb3 b/f5/43dc75e285523c8da486d5462c1fa46ab66bb3 new file mode 100644 index 000..403addb --- /dev/null +++ b/f5/43dc75e285523c8da486d5462c1fa46ab66bb3 @@ -0,0 +1 @@ +ignore: OS/2 commit ae9df7065ff38d5ad08f3136ece67da9f3b5542c Author: Caolán McNamara Date: Mon May 20 15:06:21 2013 +0100 Notes added by 'git notes add' diff --git a/73/9aa74697c7e6bd2954d80dce5dda99c6da40e5 b/73/9aa74697c7e6bd2954d80dce5dda99c6da40e5 new file mode 100644 index 000..403addb --- /dev/null +++ b/73/9aa74697c7e6bd2954d80dce5dda99c6da40e5 @@ -0,0 +1 @@ +ignore: OS/2 commit e34f3fdd92a218cc1baac610f88aee0349cf0930 Author: Caolán McNamara Date: Mon May 20 15:06:14 2013 +0100 Notes added by 'git notes add' diff --git a/a0/b26e586c25e5819ffb1eef78a5d7271d1273f5 b/a0/b26e586c25e5819ffb1eef78a5d7271d1273f5 new file mode 100644 index 000..403addb --- /dev/null +++ b/a0/b26e586c25e5819ffb1eef78a5d7271d1273f5 @@ -0,0 +1 @@ +ignore: OS/2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Fix fdo#64751 – Header & footer blue tags empty
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3980 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3980/1 Fix fdo#64751 – Header & footer blue tags empty No idea FontMetric::GetHeight() is supposed to mean, probably the code here meant GetLineHeight(). What it actually need is GetAscent(), so use it instead (which is the same as GetLineHeight() - GetDescent()). Change-Id: Ic467e56ed6b8d245ac7800f94e6d40030833328b --- M sw/source/ui/docvw/HeaderFooterWin.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 970e541..eb88d53 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -291,7 +291,7 @@ GetTextBoundRect( aTextRect, String( m_sLabel ) ); FontMetric aFontMetric = GetFontMetric( GetFont() ); -double nTextOffsetY = aFontMetric.GetHeight() - aFontMetric.GetDescent() + TEXT_PADDING; +double nTextOffsetY = aFontMetric.GetAscent() + TEXT_PADDING; Point aTextPos( TEXT_PADDING, nTextOffsetY ); basegfx::B2DHomMatrix aTextMatrix( createScaleTranslateB2DHomMatrix( -- To view, visit https://gerrit.libreoffice.org/3980 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic467e56ed6b8d245ac7800f94e6d40030833328b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Khaled Hosny ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - officecfg/registry sfx2/source svx/source vcl/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |6
sfx2/source/dialog/templdlg.cxx |2
sfx2/source/sidebar/Deck.cxx | 86 ++-
sfx2/source/sidebar/Deck.hxx |5
sfx2/source/sidebar/FocusManager.cxx |8 -
sfx2/source/sidebar/PanelTitleBar.cxx|8 -
sfx2/source/sidebar/Sidebar.hrc |5
sfx2/source/sidebar/Sidebar.src |5
sfx2/source/sidebar/SidebarController.cxx| 28 ++-
sfx2/source/sidebar/SidebarDockingWindow.cxx | 30 +++
sfx2/source/sidebar/SidebarDockingWindow.hxx |4
svx/source/sidebar/SelectionAnalyzer.cxx |4
vcl/source/window/dockwin.cxx| 15 +
13 files changed, 147 insertions(+), 59 deletions(-)
New commits:
commit c6e576da95074215d1dcfbcc4b7c4fad6cdeb27c
Author: Andre Fischer
Date: Fri May 17 08:56:55 2013 +
Resolves: #i122329# Disable undocking of stylist in the sidebar
(cherry picked from commit 8dc875f17c0cdd41e7ba6ad2f4c1ea3bda1a8be2)
Change-Id: I1a19135d3496463c8759e341449fa51d389fa264
(cherry picked from commit 048eca411083bc8a2ef95e5701bf7eba5d232a2d)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7853b72..3d81345 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -398,6 +398,8 @@ SfxTemplatePanelControl::SfxTemplatePanelControl (
OSL_ASSERT(mpBindings!=NULL);
pImpl->updateNonFamilyImages();
+
+SetStyle(GetStyle() & ~WB_DOCKABLE);
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 2ee2f48..42954e6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -755,10 +755,19 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::StateChanged( StateChangedType nType )
{
-if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+switch(nType)
{
-ImplInitSettings();
-Invalidate();
+case STATE_CHANGE_CONTROLBACKGROUND:
+ImplInitSettings();
+Invalidate();
+break;
+
+case STATE_CHANGE_STYLE:
+mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
+break;
+
+default:
+break;
}
Window::StateChanged( nType );
commit 05b2cd081452571dde558b5376d0db41f9049ab4
Author: Andre Fischer
Date: Thu May 16 11:08:30 2013 +
Resolves: #i122321# Fix processing of scroll wheel...
to not block other events
(cherry picked from commit 0a5d252c19fdd4e1e705668a604fb319dc6ceccb)
Change-Id: Ib1a3fa50e071688df41983ce8e2cb6b1c93e18c9
(cherry picked from commit 58da1dc5061fcd9abc7dd296d0d7d04d651dc10f)
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0a319e1..6534ec7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -217,49 +217,57 @@ void Deck::DataChanged (const DataChangedEvent& rEvent)
long Deck::Notify (NotifyEvent& rEvent)
{
-if (rEvent.GetType() != EVENT_COMMAND)
-return sal_False;
+if (rEvent.GetType() == EVENT_COMMAND)
+{
+CommandEvent* pCommandEvent =
reinterpret_cast(rEvent.GetData());
+if (pCommandEvent != NULL)
+switch (pCommandEvent->GetCommand())
+{
+case COMMAND_WHEEL:
+return ProcessWheelEvent(pCommandEvent, rEvent)
+? sal_True
+: sal_False;
+
+default:
+break;
+}
+}
-CommandEvent* pCommandEvent =
reinterpret_cast(rEvent.GetData());
-if (pCommandEvent == NULL)
-return sal_False;
+return Window::Notify(rEvent);
+}
-switch (pCommandEvent->GetCommand())
-{
-case COMMAND_WHEEL:
-{
-if ( ! mpVerticalScrollBar
-|| ! mpVerticalScrollBar->IsVisible())
-return sal_False;
-
-// Ignore all wheel commands from outside the vertical
-// scroll bar. Otherwise after a scroll we might land on
-// a spin field and subsequent wheel events would change
-// the value of that control.
-if (rEvent.GetWindow() != mpVerticalScrollBar.get())
-return sal_True;
-
-// Get the wheel data and check that it describes a valid
-// vertical scroll.
-const CommandWheelData* pData = pCommandEvent->GetWheelData();
-if (pData==NULL
-|| pData->GetModifier()
-|| pData->GetMode() != COMMAND_WHEEL_SCROLL
-|| pData->IsHorz())
-return sal_False;
-
-// Execute the actual scroll action.
-
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/layout' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/time.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 9b76439dff638d6fd773f2b63c377c2124810a39 Author: Mark Wielaard Date: Mon May 20 15:57:36 2013 +0200 sal osl_getGlobalTimer: Don't confuse start and current time. Change-Id: I575dd70d6b80d4f3279476037e509550cfa23fde Reviewed-on: https://gerrit.libreoffice.org/3979 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index 94a935e..227f502 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -298,8 +298,6 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer() sal_uInt32 nSeconds; #if defined(MACOSX) || defined(IOS) -startTime = mach_absolute_time(); - double diff = (double)(mach_absolute_time() - startTime) * adjust_time_factor * 1000; nSeconds = (sal_uInt32)diff; #else @@ -307,9 +305,9 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer() int res; #if defined(USE_CLOCK_GETTIME) -res = clock_gettime(CLOCK_REALTIME, &startTime); +res = clock_gettime(CLOCK_REALTIME, ¤tTime); #else -res = gettimeofday( &startTime, NULL ); +res = gettimeofday( ¤tTime, NULL ); #endif assert(res == 0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] sal osl_getGlobalTimer: Don't confuse start and current time...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3979 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3979 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I575dd70d6b80d4f3279476037e509550cfa23fde Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mark Wielaard Gerrit-Reviewer: Tor Lillqvist ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/time.c |1 + 1 file changed, 1 insertion(+) New commits: commit 7281b2b67d252969b383f1fff8294cc88f313137 Author: Tor Lillqvist Date: Mon May 20 17:30:09 2013 +0300 WaE: variable ´res´ set but not used Change-Id: I5f252f75d22f041c76c7d3cfcdd36f69becf086f diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index 227f502..b71dd7d 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -290,6 +290,7 @@ void sal_initGlobalTimer() res = gettimeofday( &startTime, NULL ); #endif /* NDef USE_CLOCK_GETTIME */ assert(res == 0); + (void) res; #endif /* ! (MACOSX || IOS) */ } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tpline.cxx | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit bbfcdb281c02c4a79b49c86499ba52571002
Author: Marcos Paulo
Date: Mon May 20 01:18:39 2013 -0300
fdo#38838 Replacement of the String with OUString
Change-Id: Ib6fda987be15525d939cfe5c3e65f881aff83131
Reviewed-on: https://gerrit.libreoffice.org/3968
Reviewed-by: Ricardo Montania
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 42d5ca8..465924c 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -127,8 +127,8 @@ SvxLineTabPage::SvxLineTabPage
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXLStyle( XLINE_DASH ),
aXWidth ( 1 ),
-aXDash ( String(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
-aXColor ( String(), COL_LIGHTRED ),
+aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
+aXColor ( OUString(), COL_LIGHTRED ),
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() ),
pnLineEndListState( 0 ),
@@ -136,17 +136,17 @@ SvxLineTabPage::SvxLineTabPage
pnColorListState( 0 ),
nPageType ( 0 )
{
-aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE)));
-aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) );
-aMtrStartWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_START_WIDTH )
) );
-aLbEndStyle.SetAccessibleName(String(CUI_RES( STR_LB_END_STYLE ) ) );
-aMtrEndWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) );
-aTsbCenterStart.SetAccessibleName(String(CUI_RES( STR_CENTER_START ) ) );
-aTsbCenterEnd.SetAccessibleName(String(CUI_RES( STR_CENTER_END ) ) );
+aLbEndStyle.SetAccessibleName(OUString(CUI_RES(STR_STYLE)));
+aLbStartStyle.SetAccessibleName(OUString(CUI_RES( STR_LB_START_STYLE ) ) );
+aMtrStartWidth.SetAccessibleName(OUString(CUI_RES( STR_MTR_FLD_START_WIDTH
) ) );
+aLbEndStyle.SetAccessibleName(OUString(CUI_RES( STR_LB_END_STYLE ) ) );
+aMtrEndWidth.SetAccessibleName(OUString(CUI_RES( STR_MTR_FLD_END_WIDTH ) )
);
+aTsbCenterStart.SetAccessibleName(OUString(CUI_RES( STR_CENTER_START ) ) );
+aTsbCenterEnd.SetAccessibleName(OUString(CUI_RES( STR_CENTER_END ) ) );
FreeResource();
-aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+aCtlPreview.SetAccessibleName(OUString(CUI_RES(STR_EXAMPLE)));
// This Page requires ExchangeSupport
SetExchangeSupport();
@@ -518,7 +518,7 @@ void SvxLineTabPage::FillListboxes()
aLbLineStyle.SelectEntryPos( nOldSelect );
// Line end style
-String sNone( SVX_RES( RID_SVXSTR_NONE ) );
+OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
nOldSelect = aLbStartStyle.GetSelectEntryPos();
aLbStartStyle.Clear();
aLbStartStyle.InsertEntry( sNone );
@@ -586,7 +586,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*pnLineEndListState = CT_NONE;
nPos = aLbLineStyle.GetSelectEntryPos();
-String sNone( SVX_RES( RID_SVXSTR_NONE ) );
+OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
aLbStartStyle.Clear();
aLbStartStyle.InsertEntry( sNone );
@@ -1293,7 +1293,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit );
}
else
-aMtrLineWidth.SetText( String() );
+aMtrLineWidth.SetText( OUString() );
// Line color
aLbColor.SetNoSelection();
@@ -1304,7 +1304,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
aLbColor.SelectEntry( aCol );
if( aLbColor.GetSelectEntryCount() == 0 )
{
-aLbColor.InsertEntry( aCol, String() );
+aLbColor.InsertEntry( aCol, OUString() );
aLbColor.SelectEntry( aCol );
}
}
@@ -1387,7 +1387,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
Get( XATTR_LINESTARTWIDTH ) ).GetValue(),
ePoolUnit );
}
else
-aMtrStartWidth.SetText( String() );
+aMtrStartWidth.SetText( OUString() );
// Line end strength
if( bObjSelected &&
@@ -1401,7 +1401,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
Get( XATTR_LINEENDWIDTH ) ).GetValue(), ePoolUnit
);
}
else
-aMtrEndWidth.SetText( String() );
+aMtrEndWidth.SetText( OUString() );
// Centered line end (start)
if( bObjSelected &&
@@ -1452,7 +1452,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
ChangeTransparentHdl_Impl( NULL );
}
else
-aMtrTransparent.SetText( String() );
+aMtrTransparent.SetText( OUString() );
[PUSHED] fdo#38838 Replacement of the String with OUString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3968 Approvals: Ricardo Montania: Looks good to me, but someone else must approve Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3968 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6fda987be15525d939cfe5c3e65f881aff83131 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Paulo dos Santos Gerrit-Reviewer: Luboš Luňák Gerrit-Reviewer: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - filter/source include/filter officecfg/registry sd/source
filter/source/msfilter/escherex.cxx| 198 ++--
filter/source/msfilter/msdffimp.cxx| 213 +
include/filter/msfilter/escherex.hxx | 13
include/filter/msfilter/msdffimp.hxx |3
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2
sd/source/filter/eppt/epptso.cxx | 24 -
6 files changed, 349 insertions(+), 104 deletions(-)
New commits:
commit 7e7ccea7cc91e86d7d345b85940dba16bec36fc4
Author: Caolán McNamara
Date: Mon May 20 15:55:42 2013 +0100
go back to 8 colorvalueset columns
Change-Id: I9e345b3dea1d4a13ac2307bcebda19d753ecd7d0
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index be586f7..f20d0bd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6255,7 +6255,7 @@
Defines the number of columns that will be shown in a
ColorValueSet.
-12
+8
commit 0982b526bf0cd938af468f8c2d05830d6b6a8620
Author: Jianyuan Li
Date: Thu Aug 16 01:13:03 2012 +
Resolves: #i120554# Shape Gradient MS2003 import/export Enhancement
Reported by: Jianyuan Li
Patch by: Jianyuan Li
Review by: SunYing
(cherry picked from commit 09c33de80a0e5fa321979e53bf88c4d17271eba8)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/inc/filter/msfilter/msdffimp.hxx
filter/source/msfilter/escherex.cxx
filter/source/msfilter/msdffimp.cxx
Change-Id: I80a60af4862eb99523ea59e4f788b685d6de1fbd
WaE fixes: reorder initialization, handle all cases in switch, ...
(cherry picked from commit 350f294badf378806348e77e6a8ed0b5f1d5b77d)
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: I4f1bde463921d48d1e014d0521427eaa9294663e
Add default to switch statements to avoid compiler warnings.
Patch by: Jianyuan Li
(cherry picked from commit f1302af0d803ca969022e69bcf7deeb62459f789)
Change-Id: I4e78e3b565d5922d452d2cfd1bf473af1587d29b
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 5876613..4c8fec0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -18,6 +18,7 @@
*/
#include "eschesdo.hxx"
+#include
#include
#include
#include
@@ -426,20 +427,159 @@ void EscherPropertyContainer::CreateGradientProperties(
}
void EscherPropertyContainer::CreateGradientProperties(
-const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rXPropSet )
+const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rXPropSet , sal_Bool
bTransparentGradient)
{
-::com::sun::star::uno::Any aAny;
-::com::sun::star::awt::Gradient aGradient;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
OUString( "FillGradient" ), sal_False ) )
+::com::sun::star::uno::Any aAny;
+::com::sun::star::awt::Gradient*pGradient = NULL;
+
+sal_uInt32 nFillType = ESCHER_FillShadeScale;
+sal_Int32 nAngle = 0;
+sal_uInt32 nFillFocus = 0;
+sal_uInt32 nFillLR = 0;
+sal_uInt32 nFillTB = 0;
+sal_uInt32 nFirstColor = 0;//like the control var nChgColors in import
logic
+boolbWriteFillTo = false;
+
+//Transparency gradient: Means the third setting in transparency page is
set
+if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue(
+aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) )
+{
+pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
+
+::com::sun::star::uno::Any aAnyTemp;
+const rtl::OUString aPropName( "FillStyle" );
+if ( EscherPropertyValueHelper::GetPropertyValue(
+aAnyTemp, rXPropSet, aPropName, sal_False ) )
+{
+::com::sun::star::drawing::FillStyle eFS;
+if ( ! ( aAnyTemp >>= eFS ) )
+eFS = ::com::sun::star::drawing::FillStyle_SOLID;
+//solid and transparency
+if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID)
+{
+if ( EscherPropertyValueHelper::GetPropertyValue(
+aAnyTemp, rXPropSet, OUString( "FillColor" ), sal_False ) )
+{
+pGradient->StartColor = ImplGetColor(
*((sal_uInt32*)aAnyTemp.getValue()), sal_False );
+pGradient->EndColor = ImplGetColor(
*((sal_uInt32*)aAnyTemp.getValue()), sal_False );
+}
+}
+//gradient and transparency.
+else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT )
+{
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 09/c33de80a0e5fa321979e53bf88c4d17271eba8 35/0f294badf378806348e77e6a8ed0b5f1d5b77d
09/c33de80a0e5fa321979e53bf88c4d17271eba8 |1 + 35/0f294badf378806348e77e6a8ed0b5f1d5b77d |1 + 2 files changed, 2 insertions(+) New commits: commit 889b6c259c0590480b7fd23164ebdc69c7062ea8 Author: Caolán McNamara Date: Mon May 20 15:56:43 2013 +0100 Notes added by 'git notes add' diff --git a/35/0f294badf378806348e77e6a8ed0b5f1d5b77d b/35/0f294badf378806348e77e6a8ed0b5f1d5b77d new file mode 100644 index 000..a2fbaed --- /dev/null +++ b/35/0f294badf378806348e77e6a8ed0b5f1d5b77d @@ -0,0 +1 @@ +merged as: 0982b526bf0cd938af468f8c2d05830d6b6a8620 commit 8da9b0ae1a15342668ae242fa0f74832ffe6c612 Author: Caolán McNamara Date: Mon May 20 15:56:36 2013 +0100 Notes added by 'git notes add' diff --git a/09/c33de80a0e5fa321979e53bf88c4d17271eba8 b/09/c33de80a0e5fa321979e53bf88c4d17271eba8 new file mode 100644 index 000..a2fbaed --- /dev/null +++ b/09/c33de80a0e5fa321979e53bf88c4d17271eba8 @@ -0,0 +1 @@ +merged as: 0982b526bf0cd938af468f8c2d05830d6b6a8620 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/302af0d803ca969022e69bcf7deeb62459f789
f1/302af0d803ca969022e69bcf7deeb62459f789 |1 + 1 file changed, 1 insertion(+) New commits: commit a66bd511aabe3635a071315b8c7a5182baaf1442 Author: Caolán McNamara Date: Mon May 20 15:56:53 2013 +0100 Notes added by 'git notes add' diff --git a/f1/302af0d803ca969022e69bcf7deeb62459f789 b/f1/302af0d803ca969022e69bcf7deeb62459f789 new file mode 100644 index 000..a2fbaed --- /dev/null +++ b/f1/302af0d803ca969022e69bcf7deeb62459f789 @@ -0,0 +1 @@ +merged as: 0982b526bf0cd938af468f8c2d05830d6b6a8620 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2283f76ec11c6eed757a1f19e033df4adae7dc25
Author: Tor Lillqvist
Date: Mon May 20 18:09:11 2013 +0300
WaE: use of unary operator that may be intended as compound assignment
Change-Id: Ib1718e5d3a0f7f1e4d1941674743900be12d4e1f
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 069b8b3..25942ee 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2766,7 +2766,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet&
aSet,MSO_FillType eMSO_
nChgColors ^= 1;
else if ( nFocus < 0 )//If it is a negative focus, the color will be
swapped
{
-nFocus =- nFocus;
+nFocus = -nFocus;
nChgColors ^= 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx |4 +
sc/inc/document.hxx |2
sc/inc/formulacell.hxx |2
sc/inc/listenercontext.hxx | 12
sc/inc/table.hxx|7 +-
sc/source/core/data/column2.cxx | 38 ++---
sc/source/core/data/column3.cxx |4 -
sc/source/core/data/documen7.cxx| 15 -
sc/source/core/data/document.cxx|4 +
sc/source/core/data/formulacell.cxx | 92
sc/source/core/data/listenercontext.cxx | 12
sc/source/core/data/table2.cxx |6 +-
sc/source/core/data/table5.cxx |8 ++
13 files changed, 165 insertions(+), 41 deletions(-)
New commits:
commit 72507ec4ca301abbb2ed96ae1b2ac5c47839dbfc
Author: Kohei Yoshida
Date: Mon May 20 11:12:49 2013 -0400
Keep track of column block positions when mass-pasting formula cells.
This speeds up the following scenario:
1) type =B1 in A1. Leave A2 empty.
2) Select A1:A2 and Ctrl-C to copy.
3) Select A3:A5 (or longer if you so wish), and ctrl-V to paste.
This causes the broadcaster storage array in column B to be heavily
partitioned due to the empty cells interspersed between formula cells
in column A. Without tracking the column position this would cause a
O(n^2) complexity algorithm.
Change-Id: Ic2f23c2c2bea3353c517faa73fe5412c7528bd95
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 46ffbd9..6db56d4 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -37,6 +37,7 @@ namespace editeng { class SvxBorderLine; }
namespace sc {
struct FormulaGroupContext;
+class StartListeningContext;
class EndListeningContext;
class CopyFromClipContext;
class CopyToClipContext;
@@ -226,7 +227,7 @@ public:
void CopyFromClip(
sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2, long nDy,
ScColumn& rColumn );
-voidStartListeningInArea( SCROW nRow1, SCROW nRow2 );
+void StartListeningInArea( sc::StartListeningContext& rCxt, SCROW nRow1,
SCROW nRow2 );
voidBroadcastInArea( SCROW nRow1, SCROW nRow2 );
voidRemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
@@ -433,6 +434,7 @@ public:
voidStartListening( SvtListener& rLst, SCROW nRow );
voidEndListening( SvtListener& rLst, SCROW nRow );
+void StartListening( sc::StartListeningContext& rCxt, SCROW nRow,
SvtListener& rListener );
void EndListening( sc::EndListeningContext& rCxt, SCROW nRow, SvtListener&
rListener );
voidMoveListeners( SvtBroadcaster& rSource, SCROW nDestRow );
voidStartAllListeners();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f01e811..544c9b5 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -49,6 +49,7 @@
namespace editeng { class SvxBorderLine; }
namespace sc {
struct FormulaGroupContext;
+class StartListeningContext;
class EndListeningContext;
class CopyFromClipContext;
struct ColumnBlockPosition;
@@ -1765,6 +1766,7 @@ public:
voidEndListeningCell( const ScAddress& rAddress,
SvtListener* pListener );
+void StartListeningCell( sc::StartListeningContext& rCxt, const ScAddress&
rPos, SvtListener& rListener );
void EndListeningCell( sc::EndListeningContext& rCxt, const ScAddress&
rPos, SvtListener& rListener );
void EndListeningFormulaCells( std::vector& rCells );
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e081353..4760062 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -30,6 +30,7 @@
namespace sc {
+class StartListeningContext;
class EndListeningContext;
}
@@ -313,6 +314,7 @@ public:
// nOnlyNames may be one or more of SC_LISTENING_NAMES_*
void StartListeningTo( ScDocument* pDoc );
+void StartListeningTo( sc::StartListeningContext& rCxt );
void EndListeningTo(
ScDocument* pDoc, ScTokenArray* pArr = NULL, ScAddress aPos =
ScAddress() );
void EndListeningTo( sc::EndListeningContext& rCxt );
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 36f26d8..2503e72 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -12,6 +12,7 @@
#include "address.hxx"
#include "columnspanset.hxx"
+#include "mtvelements.hxx"
#include
@@ -19,6 +20,17 @@ class ScDocument;
namespace sc {
+class StartListeningContext : boost::noncopyable
+{
+ScDocument& mrDoc;
+ColumnBlockPositionSet maSet;
+public:
+StartListeningContext(ScDocument& rDoc);
+ScDocument& getDoc();
+
+ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
+};
+
class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f04a9bb..48fca53 100644
--- a/sc/inc
Re: [libreoffice-users] Ask.LibreOffice.org and Bugzilla Twitter accounts
Great Idea (I've CC-ed QA because BugZilla is related to them) On 17 May 2013 12:27, Zeki Bildirici wrote: > Hi, > > You know social media is a very effective channel for getting people's > attention. Also it can be used a regular reminder/ping'er/poke'r for > communities. > > So using the social media's advantages to increase the community's > attention on Ask.LibreOffice.org site and Bugzilla will be good imho. > > We had used this method in Pardus GNU/Linux and it worked. After > asking to Florian for his advice that if is this possible to use this > channels for LibreOffice, i've creaed two twitter accounts. > > The new accounts are: > > LibreOffice Bugzilla: > https://twitter.com/LibreOfficeBugs > > Ask.LibreOffice.org: > https://twitter.com/AskLibreOffice > > I've connected ask site's new question feeds and bugzilla's new bug's > feeds to this accounts. > > The goals of having this accounts are: > > · To keep more attention on questions and bugs > > · Make community contribution process more social > > · To poke/ ping community’s members and asking for the minimum > contribution that can give constantly > > · Spread the questions and bugs to their networks to find answers as > soon as possible which will increase the possibility find the person > whom has the answer > > · Make our ask and bugzilla more open to the community and increase > the number of persons(not regular contributors) > > > Well, there is also reasons under the “What current situation misses” > questions > > · Having lots of bugzilla mails is not for ordinary community members, > people does not want their inbox is filled with bug mails which most > of them are not in interested. But twitter streams are different, it > comes and passes through no rubbish left there. Trying to confirm a > bug is generally a simple work to do, we can involve more people(other > than the regular bugbusters) to have with this feeds. > > · Visiting ask site is not a practical exercise made every time, or > getting feeds from Google Reader is not practiced by everyone, but > most people use social media actively. This means more eyes will be on > ask and bug sites constantly. > > · As said above, having constant attention for this sites are not > possible for passive contributors > > · There is no chance to spread the questions through LibreOffice > related networks. But with this accounts, the followers will generate > a core LibreOffice network which will be feed through this accounts. > > I hope that this accounts will help to decrease the unanswered > questions in the ask site(1.191 questions ~1/3 ) and activate more > members to help triage bugs in bugzilla. > > If you have a twitter account please follow and promote/announce this > accounts. > > Of course the most important thing is the interest of community and > the will to became a part of this wonderful community to make > LibreOffice the best free Office suite ever. > > Best regards, > Zeki > > -- > To unsubscribe e-mail to: users+unsubscr...@global.libreoffice.org > Problems? > http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ > Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette > List archive: http://listarchives.libreoffice.org/global/users/ > All messages sent to this list will be publicly archived and cannot be > deleted > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - graphite/graphite2.narrowing.patch.1 graphite/UnpackedTarball_graphite.mk
graphite/UnpackedTarball_graphite.mk |1 +
graphite/graphite2.narrowing.patch.1 | 22 ++
2 files changed, 23 insertions(+)
New commits:
commit e802d167305b178e19c771ab93be3e037d3525c6
Author: Stephan Bergmann
Date: Mon Dec 10 10:48:50 2012 +0100
-Wc++11-narrowing
"non-constant-expression cannot be narrowed from type 'size_t' (aka
'unsigned
long') to 'uint16' (aka 'unsigned short') in initializer list" etc. with
Clang
-std=c++11
Change-Id: I15ff37bbc3d20c14db850678a9b9e295b900de85
diff --git a/graphite/UnpackedTarball_graphite.mk
b/graphite/UnpackedTarball_graphite.mk
index 53b73b1..25638da 100644
--- a/graphite/UnpackedTarball_graphite.mk
+++ b/graphite/UnpackedTarball_graphite.mk
@@ -15,6 +15,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
graphite/graphite2.patch \
graphite/graphite2.issue1030.patch.1 \
+ graphite/graphite2.narrowing.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.narrowing.patch.1
b/graphite/graphite2.narrowing.patch.1
new file mode 100644
index 000..f19c8a3
--- /dev/null
+++ b/graphite/graphite2.narrowing.patch.1
@@ -0,0 +1,22 @@
+--- graphite/src/Code.cpp
graphite/src/Code.cpp
+@@ -169,8 +169,8 @@ Machine::Code::Code(bool is_constraint,
+ bytecode_end,
+ pre_context,
+ rule_length,
+-silf.numClasses(),
+-face.glyphs().numAttrs(),
++static_cast(silf.numClasses()),
++static_cast(face.glyphs().numAttrs()),
+ face.numFeatures(),
+ {1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,255,
+@@ -178,7 +178,7 @@ Machine::Code::Code(bool is_constraint,
+ 1,1,1,1,1,1,0,0,
+ 0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,
+- 0,0,0,0,0,0,0, silf.numUser()}
++ 0,0,0,0,0,0,0, static_cast(silf.numUser())}
+ };
+
+ decoder dec(lims, *this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/listenercontext.hxx |3 +++
sc/source/core/data/column2.cxx | 13 +++--
sc/source/core/data/listenercontext.cxx |7 ++-
3 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 822f0ad64aaff65737bf10189642538f2dd81225
Author: Kohei Yoshida
Date: Mon May 20 12:25:19 2013 -0400
Do the same trick when getting broadcasters during mass formula cell
deletion.
Change-Id: Iee1b3ff637d10c6bd2d2342db518a2fc986327b7
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 2503e72..f4fbb0f 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -35,10 +35,13 @@ class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
ColumnSpanSet maSet;
+ColumnBlockPositionSet maPosSet;
public:
EndListeningContext(ScDocument& rDoc);
ScDocument& getDoc();
+ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
+
void addEmptyBroadcasterPosition(SCTAB nTab, SCCOL nCol, SCROW nRow);
void purgeEmptyBroadcasters();
};
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index eeb5519..324519a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2107,10 +2107,19 @@ void ScColumn::StartListening(
sc::StartListeningContext& rCxt, SCROW nRow, SvtL
void ScColumn::EndListening( sc::EndListeningContext& rCxt, SCROW nRow,
SvtListener& rListener )
{
-SvtBroadcaster* pBC = GetBroadcaster(nRow);
-if (!pBC)
+sc::ColumnBlockPosition* p = rCxt.getBlockPosition(nTab, nCol);
+if (!p)
+return;
+
+sc::BroadcasterStoreType::iterator& it = p->miBroadcasterPos;
+std::pair aPos =
maBroadcasters.position(it, nRow);
+it = aPos.first; // store the block position for next iteration.
+if (it->type != sc::element_type_broadcaster)
return;
+SvtBroadcaster* pBC = sc::custom_broadcaster_block::at(*it->data,
aPos.second);
+OSL_ASSERT(pBC);
+
rListener.EndListening(*pBC);
if (!pBC->HasListeners())
// There is no more listeners for this cell. Add it to the purge list
for later purging.
diff --git a/sc/source/core/data/listenercontext.cxx
b/sc/source/core/data/listenercontext.cxx
index 7ab3799..f53f1bc 100644
--- a/sc/source/core/data/listenercontext.cxx
+++ b/sc/source/core/data/listenercontext.cxx
@@ -40,13 +40,18 @@ ColumnBlockPosition*
StartListeningContext::getBlockPosition(SCTAB nTab, SCCOL n
return maSet.getBlockPosition(nTab, nCol);
}
-EndListeningContext::EndListeningContext(ScDocument& rDoc) : mrDoc(rDoc) {}
+EndListeningContext::EndListeningContext(ScDocument& rDoc) : mrDoc(rDoc),
maPosSet(rDoc) {}
ScDocument& EndListeningContext::getDoc()
{
return mrDoc;
}
+ColumnBlockPosition* EndListeningContext::getBlockPosition(SCTAB nTab, SCCOL
nCol)
+{
+return maPosSet.getBlockPosition(nTab, nCol);
+}
+
void EndListeningContext::addEmptyBroadcasterPosition(SCTAB nTab, SCCOL nCol,
SCROW nRow)
{
maSet.set(nTab, nCol, nRow, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/document.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 34da5c4cd4d4dbbffe347b8cc425630b255d9333
Author: Kohei Yoshida
Date: Mon May 20 12:35:05 2013 -0400
A bit of cleanup.
Change-Id: I9f200377c1f5bf44eb4ba60c272b02ae3d632a19
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index d47f837..d9145b0 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2229,26 +2229,29 @@ ScDocument::NumFmtMergeHandler::~NumFmtMergeHandler()
SvtBroadcaster* ScDocument::GetBroadcaster( const ScAddress& rPos )
{
-if (!TableExists(rPos.Tab()))
+ScTable* pTab = FetchTable(rPos.Tab());
+if (!pTab)
return NULL;
-return maTabs[rPos.Tab()]->GetBroadcaster(rPos.Col(), rPos.Row());
+return pTab->GetBroadcaster(rPos.Col(), rPos.Row());
}
const SvtBroadcaster* ScDocument::GetBroadcaster( const ScAddress& rPos ) const
{
-if (!TableExists(rPos.Tab()))
+ScTable* pTab = FetchTable(rPos.Tab());
+if (!pTab)
return NULL;
-return maTabs[rPos.Tab()]->GetBroadcaster(rPos.Col(), rPos.Row());
+return pTab->GetBroadcaster(rPos.Col(), rPos.Row());
}
void ScDocument::DeleteBroadcasters( const ScAddress& rTopPos, SCROW nLength )
{
-if (!TableExists(rTopPos.Tab()) || nLength <= 0)
+ScTable* pTab = FetchTable(rTopPos.Tab());
+if (!pTab || nLength <= 0)
return;
-maTabs[rTopPos.Tab()]->DeleteBroadcasters(rTopPos.Col(), rTopPos.Row(),
rTopPos.Row()+nLength-1);
+pTab->DeleteBroadcasters(rTopPos.Col(), rTopPos.Row(),
rTopPos.Row()+nLength-1);
}
bool ScDocument::TableExists( SCTAB nTab ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/CustomTarget_deb.mk sysui/CustomTarget_rpm.mk sysui/CustomTarget_share.mk sysui/CustomTarget_slackware.mk sysui/CustomTarget_solaris.mk sysui/Package_desktop.mk s
sysui/CustomTarget_deb.mk |2 ++ sysui/CustomTarget_rpm.mk |2 ++ sysui/CustomTarget_share.mk | 12 ++-- sysui/CustomTarget_slackware.mk |2 ++ sysui/CustomTarget_solaris.mk |2 ++ sysui/Package_desktop.mk|2 ++ sysui/productlist.mk| 20 7 files changed, 32 insertions(+), 10 deletions(-) New commits: commit 514d69eff398b32639fe4d91b503740da1aac3ae Author: David Tardon Date: Sat May 18 09:11:24 2013 +0200 put common vars into standalone makefile Change-Id: Iab78a95bc8588b89fb10dc96b6c2c25e864fc1f4 diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index 80f29e3..81afdd9 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +include $(SRCDIR)/sysui/productlist.mk + deb_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/deb) deb_SRCDIR := $(SRCDIR)/sysui/desktop/debian diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk index feccac8..8cc56ed 100644 --- a/sysui/CustomTarget_rpm.mk +++ b/sysui/CustomTarget_rpm.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +include $(SRCDIR)/sysui/productlist.mk + rpm_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/rpm) rpm_SRCDIR := $(SRCDIR)/sysui/desktop diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index f3a5563..e342cfa 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +include $(SRCDIR)/sysui/productlist.mk + ifeq ($(ENABLE_GIO),TRUE) brand_URIPARAM := --urls else @@ -112,16 +114,6 @@ ULFS := documents.ulf \ launcher_genericname.ulf \ launcher_unityquicklist.ulf -PRODUCTLIST := libreoffice libreofficedev oxygenoffice -PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) -PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR) -PRODUCTNAME.libreoffice := LibreOffice -PRODUCTNAME.libreofficeodev := LibreOfficeDev -PRODUCTNAME.oxygenoffice := OxygenOffice -UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT) -UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT) -UNIXFILENAME.oxygenoffice := oxygenoffice$(PKGVERSIONSHORT) - $(eval $(call gb_CustomTarget_CustomTarget,sysui/share)) $(eval $(call gb_CustomTarget_register_targets,sysui/share,\ diff --git a/sysui/CustomTarget_slackware.mk b/sysui/CustomTarget_slackware.mk index e5145fe..f717df7 100644 --- a/sysui/CustomTarget_slackware.mk +++ b/sysui/CustomTarget_slackware.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +include $(SRCDIR)/sysui/productlist.mk + slack_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/slackware) slack_SRCDIR := $(SRCDIR)/sysui/desktop/slackware diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk index 8d9210c..9f671a8 100644 --- a/sysui/CustomTarget_solaris.mk +++ b/sysui/CustomTarget_solaris.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +include $(SRCDIR)/sysui/productlist.mk + solaris_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/solaris) solaris_SRCDIR := $(SRCDIR)/sysui/desktop/solaris diff --git a/sysui/Package_desktop.mk b/sysui/Package_desktop.mk index 80e71ba..64984a7 100644 --- a/sysui/Package_desktop.mk +++ b/sysui/Package_desktop.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +include $(SRCDIR)/sysui/productlist.mk + $(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget)) ifneq ($(filter deb,$(PKGFORMAT)),) diff --git a/sysui/productlist.mk b/sysui/productlist.mk new file mode 100644 index 000..00d471e --- /dev/null +++ b/sysui/productlist.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRODUCTLIST := libreoffice libreofficedev oxygenoffice +PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) +PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR) +PRODUCTNAME.libreoffice := LibreOffice +PRODUCTNAME.libreofficeodev := LibreOfficeDev +PRODUCTNAME.oxygenoffice := OxygenOffice +UNIXFILENAME.libreoffice := $(PRODUCTNAMELC.libreoffice)$(PKGVERSIONSHORT) +UNIXFILENAME.libreofficedev := $(PRODUCTNAMELC.libreofficedev)$(PKGVERSIONSHORT) +UNIXFILENAME.oxygenoffice := $(PRODUCTNAMELC.oxygenoffice)$(PKGVERSIONSHORT) + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/list
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx |2 -
sc/inc/columnspanset.hxx|1
sc/inc/document.hxx |2 -
sc/inc/table.hxx|2 -
sc/source/core/data/column2.cxx |5 ++--
sc/source/core/data/columnspanset.cxx | 33 +---
sc/source/core/data/document.cxx|6 ++---
sc/source/core/data/listenercontext.cxx | 14 +++--
sc/source/core/data/table1.cxx |5 ++--
9 files changed, 26 insertions(+), 44 deletions(-)
New commits:
commit 7deddb5045887ec5b905bf8c2827657ad4ff9757
Author: Kohei Yoshida
Date: Mon May 20 13:17:28 2013 -0400
Ditto when purging broadcasters.
Change-Id: I632d617cad76485f7e1f57daa7db4d4cfa775e8b
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6db56d4..d1492eb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -471,7 +471,7 @@ public:
SvtBroadcaster* GetBroadcaster( SCROW nRow );
const SvtBroadcaster* GetBroadcaster( SCROW nRow ) const;
-void DeleteBroadcasters( SCROW nRow1, SCROW nRow2 );
+void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCROW nRow1,
SCROW nRow2 );
private:
void UpdateScriptType( sc::CellTextAttr& rAttr, SCROW nRow );
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 35d94bf..ab24828 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -47,7 +47,6 @@ public:
void set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal);
void executeFromTop(Action& ac) const;
-void executeFromBottom(Action& ac) const;
};
}
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 544c9b5..ff525a6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1970,7 +1970,7 @@ public:
SvtBroadcaster* GetBroadcaster( const ScAddress& rPos );
const SvtBroadcaster* GetBroadcaster( const ScAddress& rPos ) const;
-void DeleteBroadcasters( const ScAddress& rTopPos, SCROW nLength );
+void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, const
ScAddress& rTopPos, SCROW nLength );
private: // CLOOK-Impl-methods
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 48fca53..6038311 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -850,7 +850,7 @@ public:
SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow );
const SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow ) const;
-void DeleteBroadcasters( SCCOL nCol, SCROW nRow1, SCROW nRow2 );
+void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol,
SCROW nRow1, SCROW nRow2 );
/** Replace behaves differently to the Search; adjust the rCol and rRow
accordingly.
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 324519a..43a0ee5 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1605,9 +1605,10 @@ const SvtBroadcaster* ScColumn::GetBroadcaster(SCROW
nRow) const
return maBroadcasters.get(nRow);
}
-void ScColumn::DeleteBroadcasters( SCROW nRow1, SCROW nRow2 )
+void ScColumn::DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCROW
nRow1, SCROW nRow2 )
{
-maBroadcasters.set_empty(nRow1, nRow2);
+rBlockPos.miBroadcasterPos =
+maBroadcasters.set_empty(rBlockPos.miBroadcasterPos, nRow1, nRow2);
}
sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
diff --git a/sc/source/core/data/columnspanset.cxx
b/sc/source/core/data/columnspanset.cxx
index ea4f706..9b63dc7 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -85,43 +85,14 @@ void ColumnSpanSet::executeFromTop(Action& ac) const
ColumnSpansType::const_iterator it = rCol.begin(), itEnd =
rCol.end();
SCROW nRow1, nRow2;
nRow1 = it->first;
+bool bVal = it->second;
for (++it; it != itEnd; ++it)
{
nRow2 = it->first-1;
-bool bVal = it->second;
ac.execute(ScAddress(nCol, nRow1, nTab), nRow2-nRow1+1, bVal);
nRow1 = nRow2+1; // for the next iteration.
-}
-}
-}
-}
-
-void ColumnSpanSet::executeFromBottom(Action& ac) const
-{
-for (size_t nTab = 0; nTab < maDoc.size(); ++nTab)
-{
-if (!maDoc[nTab])
-continue;
-
-const TableType& rTab = *maDoc[nTab];
-for (size_t nCol = 0; nCol < rTab.size(); ++nCol)
-{
-if (!rTab[nCol])
-continue;
-
-ac.startColumn(nTab, nCol);
-ColumnSpansType& rCol = *rTab[nCol];
-ColumnSpansType::const_reverse_iterator it = rCol.rbegin(), itEnd
= rCol.rend();
-SCROW nRow1, nRow2;
-nRow2 = it->first-1;
-for (++it; it != itEnd; ++it)
-{
-nRow1 = it->first;
-bool bVal = it->second;
-ac.execute(ScAddress(nCo
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Joel Madero changed: What|Removed |Added Depends on||64753 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #224 from Joel Madero --- Nominated 64753 - document/sheet protection is completely lost with .xlsx format which seems to be quite bad. Works fine for xls and of course ods formats -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/drawview.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit a53efad8dea0b0d78a5ff2b84aa2f09a4c178fd6 Author: Faisal M. Al-Otaibi Date: Sat May 18 08:33:11 2013 +0300 fdo#63878 fix the zoom bug on RTL sheet fix the X position after check if the sheet are RTL Change-Id: Icbb9ce44508698e0f03898b202e033c07ae2de70 Reviewed-on: https://gerrit.libreoffice.org/3954 Reviewed-by: Noel Power Tested-by: Noel Power diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 8f66038..a51c66a 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -843,6 +843,9 @@ void ScDrawView::SyncForGrid( SdrObject* pObj ) Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); Point aCurPosHmm = pGridWin->PixelToLogic(aCurPos, aDrawMode ); Point aGridOff = ( aCurPosHmm - aOldPos ); +// fdo#63878 Fix the X position for RTL Sheet +if( pDoc->IsNegativePage( GetTab() ) ) +aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() ); pObj->SetGridOffset( aGridOff ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#63878 fix the zoom bug on RTL sheet
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3954 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3954 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbb9ce44508698e0f03898b202e033c07ae2de70 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi Gerrit-Reviewer: Noel Power ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3a/125c8efe2af8f15e4606558063ffab64da0566
3a/125c8efe2af8f15e4606558063ffab64da0566 |1 + 1 file changed, 1 insertion(+) New commits: commit 074a58e97f6aeea39db125d7f8f311b2535174d8 Author: Xisco Fauli Date: Mon May 20 20:12:12 2013 +0200 Notes added by 'git notes add' diff --git a/3a/125c8efe2af8f15e4606558063ffab64da0566 b/3a/125c8efe2af8f15e4606558063ffab64da0566 new file mode 100644 index 000..220a690 --- /dev/null +++ b/3a/125c8efe2af8f15e4606558063ffab64da0566 @@ -0,0 +1 @@ +prefer: 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - basic/source
basic/source/runtime/methods.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 71101052ca31ef5da3700fdcf5540d22529d4ff2
Author: Noel Power
Date: Mon May 20 09:56:26 2013 +0100
fix wildcard handling regression( for basic functions like Dir ) fdo#64536
Tweak another fallout from String->OUString
Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd
(cherry picked from commit 175509176433cf5df2d98718e1a6f9cf5bbe9658)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index c39c7e6..06f8ce8 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2608,7 +2608,7 @@ OUString implSetupWildcard( const OUString& rFileParam,
SbiRTLData* pRTLData )
// Is there a pure file name left? Otherwise the path is
// invalid anyway because it was not accepted by OSL before
-if (string::equals(aPureFileName, '*'))
+if (!string::equals(aPureFileName, '*'))
{
pRTLData->pWildCard = new WildCard( aPureFileName );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#46553 Update embedded manifest on win32 builds to declar...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3981 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3981/1 fdo#46553 Update embedded manifest on win32 builds to declare dpiAware Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd --- M solenv/gbuild/platform/com_MSC_class.mk A solenv/inc/DeclareDPIAware.manifest 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 1ea0466..bd033d5 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -219,6 +219,7 @@ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) \ $(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2 && touch -r $(1) $(DLLTARGET).manifest $(DLLTARGET); fi) \ $(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1 && touch -r $(1) $(1).manifest; fi) \ + $(if $(filter YES,$(TARGETGUI)),&& if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 ; fi) \ $(if $(filter Library,$(TARGETTYPE)),&& \ echo $(notdir $(DLLTARGET)) > $(1).exports.tmp && \ $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest new file mode 100644 index 000..bb01230 --- /dev/null +++ b/solenv/inc/DeclareDPIAware.manifest @@ -0,0 +1,7 @@ + + +http://schemas.microsoft.com/SMI/2005/WindowsSettings";> + true + + + -- To view, visit https://gerrit.libreoffice.org/3981 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basic/source
basic/source/runtime/methods.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 715222bc431183028b2accb2afb5f21b42008d70
Author: Noel Power
Date: Mon May 20 09:56:26 2013 +0100
fix wildcard handling regression( for basic functions like Dir ) fdo#64536
Tweak another fallout from String->OUString
Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd
(cherry picked from commit 175509176433cf5df2d98718e1a6f9cf5bbe9658)
Reviewed-on: https://gerrit.libreoffice.org/3975
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 666dbba..489f996 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2586,7 +2586,7 @@ OUString implSetupWildcard( const OUString& rFileParam,
SbiRTLData* pRTLData )
// Is there a pure file name left? Otherwise the path is
// invalid anyway because it was not accepted by OSL before
-if (string::equals(aPureFileName, '*'))
+if (!string::equals(aPureFileName, '*'))
{
pRTLData->pWildCard = new WildCard( aPureFileName );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impimagetree.cxx | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit e673655ba784bd2993fb4e364c042fbc0e938d2d
Author: Rodolfo Ribeiro Gomes
Date: Mon May 13 21:42:31 2013 -0300
Make some uses of OUStrings a little more readable
Change-Id: I2e85fa39abbff86918464aae67b4b9eacd3bf7a4
Signed-off-by: Rodolfo Ribeiro Gomes
Reviewed-on: https://gerrit.libreoffice.org/3949
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index a2cab8b..6e449de 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -67,10 +67,7 @@ namespace {
OUString createPath(
OUString const & name, sal_Int32 pos, OUString const & locale)
{
-OUStringBuffer b(name.copy(0, pos + 1));
-b.append(locale);
-b.append(name.copy(pos));
-return b.makeStringAndClear();
+return name.copy(0, pos + 1) + locale + name.copy(pos);
}
boost::shared_ptr< SvStream > wrapFile(osl::File & file)
@@ -280,10 +277,7 @@ void ImplImageTree::resetPaths() {
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
-OUStringBuffer b;
-b.appendAscii("images_");
-b.append(m_style);
-bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
+bool ok = u.Append("images_" + m_style, INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
m_paths.push_back(
std::make_pair(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild solenv/inc
solenv/gbuild/platform/com_MSC_class.mk |1 + solenv/inc/DeclareDPIAware.manifest |7 +++ 2 files changed, 8 insertions(+) New commits: commit d044918751da4bbdf87f7fb12382abf6c4068c07 Author: Andras Timar Date: Mon May 20 20:30:04 2013 +0200 fdo#46553 Update embedded manifest on win32 builds to declare dpiAware Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Reviewed-on: https://gerrit.libreoffice.org/3981 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 1ea0466..bd033d5 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -219,6 +219,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) \ $(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2 && touch -r $(1) $(DLLTARGET).manifest $(DLLTARGET); fi) \ $(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1 && touch -r $(1) $(1).manifest; fi) \ + $(if $(filter YES,$(TARGETGUI)),&& if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 ; fi) \ $(if $(filter Library,$(TARGETTYPE)),&& \ echo $(notdir $(DLLTARGET)) > $(1).exports.tmp && \ $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest new file mode 100644 index 000..bb01230 --- /dev/null +++ b/solenv/inc/DeclareDPIAware.manifest @@ -0,0 +1,7 @@ + + +http://schemas.microsoft.com/SMI/2005/WindowsSettings";> + true + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fix wildcard handling regression( for basic functions like D...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3975 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3975 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Make some uses of OUStrings a little more readable
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3949 Approvals: Luboš Luňák: Verified; Looks good to me, approved Fridrich Strba: -- To view, visit https://gerrit.libreoffice.org/3949 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e85fa39abbff86918464aae67b4b9eacd3bf7a4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rodolfo Ribeiro Gomes Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#46553 Update embedded manifest on win32 builds to declar...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3981 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3981 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/fontmanager/fontconfig.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit d95456fc4cd10a09ac5d097ba1a06ae884f7f9f1
Author: Mark Wielaard
Date: Mon May 20 00:18:23 2013 +0200
Fix memory leak in mapToFontConfigLangTag.
FcGetLangs() will return a new FCStrSet that needs to be freed after usage.
Change-Id: Ie7fe0dd160fa59077d6a90878e70d0e034680812
Reviewed-on: https://gerrit.libreoffice.org/3967
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index dc8dfa7..3e23fc9 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -811,11 +811,17 @@ namespace
sLangAttrib = OUStringToOString(rLangTag.getBcp47(),
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+{
+FcStrSetDestroy(pLangSet);
return sLangAttrib;
+}
sLangAttrib = OUStringToOString(rLangTag.getLanguageAndScript(),
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+{
+FcStrSetDestroy(pLangSet);
return sLangAttrib;
+}
OString sLang = OUStringToOString(rLangTag.getLanguage(),
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
OString sRegion = OUStringToOString(rLangTag.getCountry(),
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
@@ -824,11 +830,17 @@ namespace
{
sLangAttrib = sLang + OString('-') + sRegion;
if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+{
+FcStrSetDestroy(pLangSet);
return sLangAttrib;
+}
}
if (FcStrSetMember(pLangSet, (const FcChar8*)sLang.getStr()))
+{
+FcStrSetDestroy(pLangSet);
return sLang;
+}
return OString();
#else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7e98b46c08ab409276a347cc4ea137ba42485a1e Author: Mark Wielaard Date: Sat May 18 12:18:51 2013 +0200 valgrind support is useful independent from DBGUTIL support. Especially when valgrinding an optimized libreoffice build. Change-Id: I7d2ac5476ba8561ce6afbf8c9472550fbe959c76 Reviewed-on: https://gerrit.libreoffice.org/3966 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/configure.ac b/configure.ac index 66cef18..e0f6ec7 100644 --- a/configure.ac +++ b/configure.ac @@ -5222,7 +5222,7 @@ AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT8,$SAL_TYPES_ALIGNMENT8) dnl === dnl Check if valgrind headers are available dnl === -if test "$cross_compiling" = yes -o "$ENABLE_DBGUTIL" != TRUE; then +if test "$cross_compiling" = yes; then ENABLE_VALGRIND=FALSE else prev_cppflags=$CPPFLAGS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/sdi
sc/sdi/scalc.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 8165805982c2cab59ef5b1d711133c6d56cf6595 Author: Joren De Cuyper Date: Sat May 11 14:19:04 2013 +0200 fdo#30715 Several commands are under the wrong category Placing "insert" commands under category "insert" is more logical Change-Id: Ib322aaace39cd160cc81ef4945abd2047e6c4c12 Reviewed-on: https://gerrit.libreoffice.org/3854 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index cfe..ddcf8d4 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8291,7 +8291,7 @@ SfxVoidItem InsertFieldSheet SID_INSERT_FIELD_SHEET MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] SfxVoidItem InsertFieldDocTitle SID_INSERT_FIELD_TITLE @@ -8315,7 +8315,7 @@ SfxVoidItem InsertFieldDocTitle SID_INSERT_FIELD_TITLE MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] SfxVoidItem InsertFieldDateVariable SID_INSERT_FIELD_DATE_VAR @@ -8339,7 +8339,7 @@ SfxVoidItem InsertFieldDateVariable SID_INSERT_FIELD_DATE_VAR MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 20 +- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 43aee4c0a0ba9bb4d1722208e18991eb2408eed8 Author: Joren De Cuyper Date: Sat May 11 00:15:30 2013 +0200 resolve fdo#64446 Repeat shortcut isn't showed correctly in menu entry Change-Id: I991185f6b4efd305dc55c9ad85f9f706f8a0 Reviewed-on: https://gerrit.libreoffice.org/3850 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 2ef7c67..1dab5f7 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -961,7 +961,7 @@ .uno:ToggleFormula - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -1218,7 +1218,7 @@ .uno:Quit - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -1592,7 +1592,7 @@ .uno:Quit - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -2288,7 +2288,7 @@ .uno:SuperScript - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -2839,7 +2839,7 @@ .uno:Quit - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -3609,7 +3609,7 @@ .uno:SuperScript - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -4388,7 +4388,7 @@ .uno:SuperScript - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -5131,7 +5131,7 @@ .uno:SuperScript - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -5904,7 +5904,7 @@ .uno:SuperScript - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat @@ -6677,7 +6677,7 @@ .uno:SuperScript - + I10N SHORTCUTS - NO TRANSLATE .uno:Repeat ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source comphelper/source cppcanvas/source
canvas/source/directx/dx_bitmapcanvashelper.cxx |9 -
canvas/source/vcl/canvasbitmaphelper.cxx | 11 -
canvas/source/vcl/impltools.cxx |5
comphelper/source/container/embeddedobjectcontainer.cxx | 100 +++
cppcanvas/source/mtfrenderer/bitmapaction.cxx|4
cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx |5
cppcanvas/source/mtfrenderer/implrenderer.cxx| 15 +-
cppcanvas/source/mtfrenderer/lineaction.cxx |5
cppcanvas/source/mtfrenderer/pointaction.cxx |5
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 14 --
cppcanvas/source/mtfrenderer/textaction.cxx | 52 +++
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 10 -
12 files changed, 108 insertions(+), 127 deletions(-)
New commits:
commit bd888a331b6eafbdf3225e15e47c1190bd5bd6b7
Author: Radu Ioan
Date: Wed May 15 23:34:01 2013 +0300
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*
Change-Id: I0054bc90fdcaa2fef7e1d98a0528277be4fc341e
Reviewed-on: https://gerrit.libreoffice.org/3917
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx
b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index 9772cc2..e9577e1 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx
@@ -21,7 +21,6 @@
#include
#include
-#include
#include
#include
@@ -159,7 +158,7 @@ namespace dxcanvas
uno::Sequence< sal_Int8 > BitmapCanvasHelper::getData(
rendering::IntegerBitmapLayout& bitmapLayout,
const
geometry::IntegerRectangle2D& rect )
{
-RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getData()"
);
+SAL_INFO( "canvas.directx",
"::dxcanvas::BitmapCanvasHelper::getData()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::getData():
disposed" );
@@ -175,7 +174,7 @@ namespace dxcanvas
const rendering::IntegerBitmapLayout&
bitmapLayout,
const geometry::IntegerRectangle2D&
rect )
{
-RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setData()"
);
+SAL_INFO( "canvas.directx",
"::dxcanvas::BitmapCanvasHelper::setData()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::setData():
disposed" );
@@ -190,7 +189,7 @@ namespace dxcanvas
const rendering::IntegerBitmapLayout&
bitmapLayout,
const geometry::IntegerPoint2D&
pos )
{
-RTL_LOGFILE_CONTEXT( aLog,
"::dxcanvas::BitmapCanvasHelper::setPixel()" );
+SAL_INFO( "canvas.directx",
"::dxcanvas::BitmapCanvasHelper::setPixel()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::setPixel():
disposed" );
@@ -204,7 +203,7 @@ namespace dxcanvas
uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel(
rendering::IntegerBitmapLayout& bitmapLayout,
const
geometry::IntegerPoint2D& pos )
{
-RTL_LOGFILE_CONTEXT( aLog,
"::dxcanvas::BitmapCanvasHelper::getPixel()" );
+SAL_INFO( "canvas.directx",
"::dxcanvas::BitmapCanvasHelper::getPixel()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::getPixel():
disposed" );
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx
b/canvas/source/vcl/canvasbitmaphelper.cxx
index 6a9698a..9178ff7 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -23,7 +23,6 @@
#include
-#include
#include
#include
@@ -112,7 +111,7 @@ namespace vclcanvas
ENSURE_OR_THROW( mpDevice,
"disposed CanvasHelper" );
-RTL_LOGFILE_CONTEXT( aLog,
"::vclcanvas::CanvasBitmapHelper::getScaledBitmap()" );
+SAL_INFO( "canvas.vcl",
"::vclcanvas::CanvasBitmapHelper::getScaledBitmap()" );
if( !mpBackBuffer || mpDevice )
return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -129,7 +128,7 @@ namespace vclcanvas
uno::Sequence< sal_Int8 > CanvasBitmapHelper::getData(
rendering::IntegerBitmapLayout& rLayout,
const
geometry::IntegerRectangle2D& rect )
{
-RTL_LOGFILE_CONTEXT( aLog,
"::vclcanvas::CanvasBitmapHelper::getData()" );
+SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getData()" );
if( !mpBackBuffer )
return uno::Sequence<
[PUSHED] Fix memory leak in mapToFontConfigLangTag.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3967 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3967 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7fe0dd160fa59077d6a90878e70d0e034680812 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mark Wielaard Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] valgrind support is useful independent from DBGUTIL support.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3966 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3966 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d2ac5476ba8561ce6afbf8c9472550fbe959c76 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mark Wielaard Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
